Commit fixes for windows

jschueths · jschueths · commit 6a79d40d5047 · 2024-12-07T13:14:47.000-06:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,3 +1,7 @@
+variables:
+  OPENCV_WIN_PATH: ""
+  SDL2_WIN_PATH: ""
+  SDL2_mixer_WIN_PATH: ""
 
 stages:
   - build
@@ -42,7 +46,7 @@ windows:
     - windows
   stage: build
   script:
-    - cmake -G"Visual Studio 17 2022" -A x64 -DSDL2_DIR=$SDL2_WIN_PATH -DSDL2_mixer_DIR=$SDL2_mixer_WIN_PATH -DOpenCV_DIR=$OPENCV_WIN_PATH -B build -S .
+    - cmake -G"Visual Studio 17 2022" -A x64 -DSDL2_DIR="$env:SDL2_WIN_PATH" -DSDL2_mixer_DIR="$env:SDL2_mixer_WIN_PATH" -DOpenCV_DIR="$env:OPENCV_WIN_PATH" -B build -S .
     - cmake --build build --target ALL_BUILD --config Release
     - cmake --build build --target PACKAGE --config Release
   artifacts:
diff --git a/main.cpp b/main.cpp
@@ -1,8 +1,9 @@
 #include "app.h"
 
-int main()
+int main(int argc, char* argv[])
 {
     App visionIO{};
     visionIO.Initialize_Subsystems();
     visionIO.Run();
+    return 0;
 }
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -22,3 +22,4 @@ add_library(imgui
   imgui/backends/imgui_impl_sdlrenderer2.cpp)
 
 target_include_directories(imgui PUBLIC ${CMAKE_SOURCE_DIR}/third_party/imgui ${CMAKE_SOURCE_DIR}/third_party/imgui/backends)
+target_link_libraries(imgui PRIVATE SDL2::SDL2)

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`#include "app.h"`
`2`	`2`
`3`		`-int main()`
	`3`	`+int main(int argc, char* argv[])`
`4`	`4`	`{`
`5`	`5`	`App visionIO{};`
`6`	`6`	`visionIO.Initialize_Subsystems();`
`7`	`7`	`visionIO.Run();`
	`8`	`+ return 0;`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,4 @@ add_library(imgui`
`22`	`22`	`imgui/backends/imgui_impl_sdlrenderer2.cpp)`
`23`	`23`
`24`	`24`	`target_include_directories(imgui PUBLIC ${CMAKE_SOURCE_DIR}/third_party/imgui ${CMAKE_SOURCE_DIR}/third_party/imgui/backends)`
	`25`	`+target_link_libraries(imgui PRIVATE SDL2::SDL2)`