Group Control Update

.gitignore

@@ -43,11 +43,27 @@
 
 # Build directories
 build_master/
-Build_master/
 build_master-*/
+build_master_win/
+build_master_win-*/
 build_server/
-Build_server/
 build_server-*/
+build_server_win/
+build_server_win-*/
+build_server_amd/
+build_server_amd-*/
+lib/*.exe
+
+package_master/
+package_master-*/
+package_master_win/
+package_master_win-*/
+package_server/
+package_server-*/
+package_server_win/
+package_server_win-*/
+package_server_amd/
+package_server_amd-*/
 
 # CMake generated files
 CMakeFiles/

.vscode/c_cpp_properties.json

@@ -9,7 +9,7 @@
             "defines": [],
             "compilerPath": "/usr/bin/gcc",
             "cStandard": "c17",
-            "cppStandard": "gnu++17",
+            "cppStandard": "c++17",
             "intelliSenseMode": "linux-gcc-x64",
             "configurationProvider": "ms-vscode.makefile-tools"
         }

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "C_Cpp.errorSquiggles": "disabled"
+}

CMakeLists.txt

@@ -1,6 +1,19 @@
 cmake_minimum_required(VERSION 3.14)
-project(GoPro_Controller)
+project(GoPro_Controller LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_C_STANDARD 17)
+
+# --- NUCLEAR STATIC OVERRIDES (MUST BE AT THE TOP) ---
+# These must run before ANY include(FetchContent)
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "Global Static" FORCE)
+set(BUILD_STATIC_LIBS ON CACHE BOOL "Global Static" FORCE)
+
+# libhv specific overrides
+set(HV_BUILD_STATIC ON CACHE BOOL "Build libhv static" FORCE)
+set(HV_BUILD_SHARED OFF CACHE BOOL "NO Shared libhv" FORCE)
+set(HV_WITH_MQTT OFF CACHE BOOL "Disable MQTT" FORCE) # Optional: Faster build
 
 # Options
 option(BUILD_SERVER "Build the server (RPi) executable" ON)
@@ -9,6 +22,24 @@ option(BUILD_MASTER "Build the master (PC) executable" ON)
 
 # libhv (Required for Server, used in Master too if needed, but primarily Server)
 if(BUILD_SERVER OR BUILD_MASTER)
+    # --- GLOBAL CURL CONFIGURATION (Apply to BOTH Server and Master) ---
+    # Disable protocols we don't need to prevent errors like 'ldapsb_tls'
+    set(CURL_DISABLE_LDAP ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_LDAPS ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_RTSP ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_DICT ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_TFTP ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_TELNET ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_POP3 ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_IMAP ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_SMB ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_SMTP ON CACHE INTERNAL "" FORCE)
+    set(CURL_DISABLE_GOPHER ON CACHE INTERNAL "" FORCE)
+    # Curl Configuration for Static Builds
+    set(BUILD_CURL_EXE OFF CACHE INTERNAL "")
+    set(BUILD_TESTING OFF CACHE INTERNAL "")
+    set(CURL_USE_OPENSSL OFF CACHE INTERNAL "")
+
     include(FetchContent)
     FetchContent_Declare(
         libhv
@@ -20,34 +51,49 @@ if(BUILD_SERVER OR BUILD_MASTER)
     set(MDNS_DIR "lib/mdns")
     file(GLOB MDNS_SOURCES
         "${MDNS_DIR}/src/logger.cpp"
-        "${MDNS_DIR}/src/mdns.h"
         "${MDNS_DIR}/src/mdns.cpp"
+        "${MDNS_DIR}/src/mdns.h"
         "${MDNS_DIR}/src/utils.cpp"
     )
+    if (BUILD_SERVER)
+        # --- Curl Configuration for AArch64 ---
+        set(SIZEOF_OFF_T 8 CACHE INTERNAL "")
+        set(SIZEOF_CURL_OFF_T 8 CACHE INTERNAL "")
+        set(SIZEOF_SIZE_T 8 CACHE INTERNAL "")
+        set(SIZEOF_LONG 8 CACHE INTERNAL "")
+        set(HAVE_RECV ON CACHE INTERNAL "")
+        set(HAVE_SEND ON CACHE INTERNAL "")
+        set(HAVE_BOOL_T ON CACHE INTERNAL "")
+
+        # Disable features that usually break cross-compiles
+        set(CURL_DISABLE_LDAP ON CACHE INTERNAL "")
+        set(CURL_DISABLE_LDAPS ON CACHE INTERNAL "")
+        set(BUILD_CURL_EXE OFF CACHE INTERNAL "")
+        set(BUILD_TESTING OFF CACHE INTERNAL "")
+        set(CURL_USE_OPENSSL OFF CACHE INTERNAL "")
+        set(CURL_ENABLE_SSL OFF CACHE INTERNAL "")
+    endif()
+    FetchContent_Declare(
+        curl
+        URL https://github.com/curl/curl/releases/download/curl-8_5_0/curl-8.5.0.tar.gz
+    )
+    FetchContent_MakeAvailable(curl) 
 endif()
 
 if(BUILD_MASTER)
     # OpenGL
     find_package(OpenGL REQUIRED)
 
-    # OpenCV
-    find_package(OpenCV REQUIRED)
-    if(OpenCV_FOUND)
-        include_directories(${OpenCV_INCLUDE_DIRS})
+    if(WIN32)
+        set(SDL_RENDER_D3D OFF CACHE BOOL "" FORCE)
+        set(SDL_RENDER_D3D11 OFF CACHE BOOL "" FORCE)
+        set(SDL_RENDER_D3D12 OFF CACHE BOOL "" FORCE)
+        set(SDL_DIRECTX OFF CACHE BOOL "" FORCE)
+        set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON CACHE BOOL "" FORCE)
     endif()
 
     # SDL3
-    find_package(SDL3 REQUIRED)
-    if (NOT SDL3_FOUND)
-        message(STATUS "Getting SDL3 from Github")
-        include(FetchContent)
-        FetchContent_Declare(
-            SDL3
-            GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
-            GIT_TAG        release-3.2.18
-        )
-        FetchContent_MakeAvailable(SDL3)
-    endif()
+    add_subdirectory(lib/SDL3 EXCLUDE_FROM_ALL)
 
     # ImGui
     set(IMGUI_DIR "lib/imgui")
@@ -63,34 +109,227 @@ if(BUILD_MASTER)
     include_directories(${IMGUI_DIR})
     include_directories(${IMGUI_DIR}/backends)
     include_directories(lib/json/include)
-endif()
 
+    # ============================================================
+    # OpenCV - Try system first, fallback to FetchContent
+    # ============================================================
+    find_package(OpenCV QUIET COMPONENTS core imgproc videoio imgcodecs)
+
+    if(OpenCV_FOUND)
+        message(STATUS "Using system OpenCV: ${OpenCV_VERSION}")
+        set(HAVE_OPENCV TRUE)
+        set(OPENCV_FROM_SOURCE FALSE)
+    else()
+        message(STATUS "System OpenCV not found, building from source...")
+
+        if(WIN32)
+            set(GSTREAMER_DIR "C:/Program Files/gstreamer/1.0/msvc_x86_64" CACHE PATH "GStreamer installation directory")
+
+            # Help CMake find GStreamer
+            list(APPEND CMAKE_PREFIX_PATH ${GSTREAMER_DIR})
+            set(ENV{PKG_CONFIG_PATH} "${GSTREAMER_DIR}/lib/pkgconfig")
+            set(ENV{GSTREAMER_ROOT_X86_64} ${GSTREAMER_DIR})
+
+            message(STATUS "GStreamer directory: ${GSTREAMER_DIR}")
+
+            # Verify GStreamer is installed
+            if(NOT EXISTS "${GSTREAMER_DIR}/lib/pkgconfig/gstreamer-1.0.pc")
+                message(WARNING "========================================")
+                message(WARNING "GStreamer NOT FOUND at ${GSTREAMER_DIR}!")
+                message(WARNING "Download from: https://gstreamer.freedesktop.org/download/")
+                message(WARNING "Install BOTH packages:")
+                message(WARNING "  - gstreamer-1.0-msvc-x86_64-1.24.x.msi (runtime)")
+                message(WARNING "  - gstreamer-1.0-devel-msvc-x86_64-1.24.x.msi (development)")
+                message(WARNING "========================================")
+            else()
+                message(STATUS "✓ GStreamer found at ${GSTREAMER_DIR}")
+            endif()
+        endif()
+
+        # -------------------------------------------------------
+        # Disable everything we don't need (faster build)
+        # -------------------------------------------------------
+        set(BUILD_LIST "core,imgproc,videoio,imgcodecs" CACHE STRING "" FORCE)
+
+        set(BUILD_EXAMPLES         OFF CACHE BOOL "" FORCE)
+        set(BUILD_TESTS            OFF CACHE BOOL "" FORCE)
+        set(BUILD_PERF_TESTS       OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_apps      OFF CACHE BOOL "" FORCE)
+        set(BUILD_DOCS             OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_java      OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_python2   OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_python3   OFF CACHE BOOL "" FORCE)
+        set(BUILD_PROTOBUF         OFF CACHE BOOL "" FORCE)
+
+        set(WITH_CUDA              OFF CACHE BOOL "" FORCE)
+        set(WITH_OPENCL            OFF CACHE BOOL "" FORCE)
+        set(WITH_IPP               OFF CACHE BOOL "" FORCE)
+        set(WITH_ITT               OFF CACHE BOOL "" FORCE)
+        set(WITH_EIGEN             OFF CACHE BOOL "" FORCE)
+        set(WITH_TBB               OFF CACHE BOOL "" FORCE)
+        # Disable GUI toolkits
+        set(WITH_GTK OFF CACHE BOOL "" FORCE)
+        set(WITH_QT OFF CACHE BOOL "" FORCE)
+        set(WITH_WIN32UI OFF CACHE BOOL "" FORCE)
+        # Disable extra image formats
+        set(WITH_TIFF              OFF CACHE BOOL "" FORCE)
+        set(WITH_WEBP              OFF CACHE BOOL "" FORCE)
+        set(WITH_JASPER            OFF CACHE BOOL "" FORCE)
+        set(WITH_OPENEXR           OFF CACHE BOOL "" FORCE)
+        set(WITH_V4L               OFF CACHE BOOL "" FORCE)
+
+        set(WITH_GSTREAMER         ON  CACHE BOOL "Enable GStreamer" FORCE)
+        set(WITH_GSTREAMER_0_10    OFF CACHE BOOL "Disable old GStreamer 0.10" FORCE)
+        set(WITH_FFMPEG            ON  CACHE BOOL "" FORCE)
+        set(WITH_JPEG              OFF  CACHE BOOL "" FORCE)
+        set(WITH_PNG               OFF  CACHE BOOL "" FORCE)
+
+        # Disable extra modules
+        set(BUILD_opencv_calib3d OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_dnn OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_features2d OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_flann OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_highgui OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_ml OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_photo OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_stitching OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_video OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_videostab OFF CACHE BOOL "" FORCE)
+        set(BUILD_opencv_objdetect OFF CACHE BOOL "" FORCE)
+
+        # Must be OFF to match your global static override
+        set(BUILD_SHARED_LIBS      OFF CACHE BOOL "" FORCE)
+
+        FetchContent_Declare(
+            opencv
+            GIT_REPOSITORY https://github.com/opencv/opencv.git
+            GIT_TAG        4.10.0
+            GIT_SHALLOW    TRUE
+            GIT_PROGRESS   TRUE
+        )
+
+        FetchContent_MakeAvailable(opencv)
+
+        set(HAVE_OPENCV TRUE)
+        set(OPENCV_FROM_SOURCE TRUE)
+
+        message(STATUS "OpenCV source dir: ${opencv_SOURCE_DIR}")
+        message(STATUS "OpenCV binary dir: ${opencv_BINARY_DIR}")
+    endif()
+endif()
 
 # --- Server Executable ---
 if(BUILD_SERVER)
+    file(GLOB_RECURSE SERVER_SOURCE CONFIGURE_DEPENDS
+        "${CMAKE_SOURCE_DIR}/src/server/*.h"
+        "${CMAKE_SOURCE_DIR}/src/server/*.hpp"
+        "${CMAKE_SOURCE_DIR}/src/server/*.c"
+        "${CMAKE_SOURCE_DIR}/src/server/*.cpp"
+    )
+    link_directories(/usr/lib/aarch64-linux-gnu)
     add_executable(server
-        src/server/main.cpp
-        src/server/GoProController.cpp
+        ${SERVER_SOURCE}
         ${MDNS_SOURCES}
     )
-    target_link_libraries(server hv)
+    if(WIN32)
+        target_compile_options(server PRIVATE "/std:c++17")
+        target_link_options(server PRIVATE "-static-libgcc" "-static-libstdc++" "-static")
+    endif()
+    target_link_libraries(server hv_static libcurl)
     # Ensure json include is available for server too if it uses nlohmann/json
-    target_include_directories(server PRIVATE lib/json/include) 
+    target_include_directories(server PRIVATE lib/json/include "${MDNS_DIR}/src" "${MDNS_DIR}/include") 
 endif()
 
 # --- Master Executable ---
 if(BUILD_MASTER)
+    file(GLOB_RECURSE MASTER_SOURCE CONFIGURE_DEPENDS
+        "${CMAKE_SOURCE_DIR}/src/master/*.h"
+        "${CMAKE_SOURCE_DIR}/src/master/*.hpp"
+        "${CMAKE_SOURCE_DIR}/src/master/*.c"
+        "${CMAKE_SOURCE_DIR}/src/master/*.cpp"
+    )
     add_executable(master
-        src/master/main.cpp
-        src/master/GoProMaster.cpp
+        ${MASTER_SOURCE}
+        lib/imgui/misc/cpp/imgui_stdlib.cpp
         ${IMGUI_SOURCES}
         ${MDNS_SOURCES}
     )
 
-    target_link_libraries(master PRIVATE
-        OpenGL::GL
-        SDL3::SDL3
-        ${OpenCV_LIBS}
-        hv
-    )
-endif()
+    if (WIN32)
+        message(STATUS "Default WIN32 Build Master")
+
+        set(OPENCV_DIR "${CMAKE_SOURCE_DIR}/lib/opencv")
+        target_compile_options(master PRIVATE "/std:c++17")
+
+        set_property(TARGET master PROPERTY C_STANDARD 17)
+        set_property(TARGET master PROPERTY CXX_STANDARD 17)
+        set_property(TARGET master PROPERTY CXX_STANDARD_REQUIRED ON)
+        target_link_libraries(master PRIVATE
+            ${OpenCV_LIBS}
+            opencv_core
+            opencv_imgproc
+            opencv_imgcodecs
+            opencv_videoio
+            OpenGL::GL
+            SDL3::SDL3
+            hv_static
+            libcurl
+            winpthread
+        )
+
+        target_include_directories(master PRIVATE
+            ${opencv_SOURCE_DIR}/include
+            ${opencv_BINARY_DIR}
+            ${CMAKE_BINARY_DIR}
+            ${opencv_BINARY_DIR}/opencv2
+            ${opencv_SOURCE_DIR}/modules/core/include
+            ${opencv_SOURCE_DIR}/modules/imgproc/include
+            ${opencv_SOURCE_DIR}/modules/videoio/include
+            ${opencv_SOURCE_DIR}/modules/imgcodecs/include
+        )
+
+        file(GLOB_RECURSE GSTREAM_DLL "${GSTREAMER_DIR}/bin/*.dll")
+        file(GLOB_RECURSE FONT_OTF "${CMAKE_SOURCE_DIR}/*.otf")
+
+        message(STATUS "Master will be built WITH OpenCV support")
+        add_custom_command(TARGET master POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                ${GSTREAM_DLL}
+                $<TARGET_FILE_DIR:master>
+                COMMENT "Copying gstreamer dll to output directory"
+        )
+        add_custom_command(TARGET master POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                ${FONT_OTF}
+                $<TARGET_FILE_DIR:master>
+                COMMENT "Copying Font to output directory"
+        )
+        target_link_options(master PRIVATE "-static-libgcc" "-static-libstdc++" "-static")
+    else()
+        target_compile_features(master PRIVATE cxx_std_17)
+        target_link_libraries(master PRIVATE
+            ${OpenCV_LIBS}
+            OpenGL::GL
+            SDL3::SDL3
+            hv_static
+            libcurl
+        )
+    endif()
+endif()
+
+# ============================================================
+# Summary
+# ============================================================
+message(STATUS "")
+message(STATUS "========================================")
+message(STATUS "GoPro Controller - Configuration")
+message(STATUS "========================================")
+message(STATUS "Build Server:   ${BUILD_SERVER}")
+message(STATUS "Build Master:   ${BUILD_MASTER}")
+if(BUILD_MASTER)
+    message(STATUS "OpenCV:         ${HAVE_OPENCV} (from source)")
+endif()
+message(STATUS "========================================")
+message(STATUS "")
+message(STATUS "NOTE: First build may take 15-30 minutes (OpenCV compilation)")
+message(STATUS "Subsequent builds will be much faster (cached)")