From 59c7ef3ec85b4b2c5387659d6df31526fb7ec9c7 Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Wed, 25 Oct 2023 17:44:15 -0500
Subject: [PATCH] Windows is building again.

---
 CMakeLists.txt | 33 ++++++++++++++++++++++++---------
 build-all.sh   |  1 +
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b60430f8b..27b8c1f55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,6 +243,20 @@ add_executable(${CMAKE_PROJECT_NAME}
 #add_dependencies(${CMAKE_PROJECT_NAME} BUILD_PREREQS)
 
 
+if(WIN32)
+	set(DEFINE_LIST
+		-Dmain=SDL_main
+	)
+else()
+	set(DEFINE_LIST)
+endif()
+target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC
+	${DEFINE_LIST}
+	-DRS232_STATIC
+	-DFFMS_STATIC
+)
+
+
 target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
 	${BUILD_DIR}
 	${BUILD_DIR}/include
@@ -261,28 +275,30 @@ if(WIN32)
 		-mwindows
 		-static
 		-lmingw32
-		-lbcrypt
-		-ldinput8
-		-ldxguid
-		-ldxerr8
+		-latomic
+		-lole32
 		-luser32
+		-lkernel32
 		-lgdi32
 		-lwinmm
 		-limm32
-		-lole32
 		-loleaut32
-		-lshell32
-		-lsetupapi
 		-lversion
 		-luuid
+		-ladvapi32
+		-lsetupapi
+		-lshell32
+		-ldinput8
+		-lws2_32
+		-lbcrypt
 		-lssp
-		-Dmain=SDL_main
 	)
 else()
 	set(LIB_LIST)
 endif()
 target_link_libraries(${CMAKE_PROJECT_NAME}
 	-Wl,--start-group
+	${LIB_LIST}
 	${BUILD_DIR}/lib/libavcodec.a
 	${BUILD_DIR}/lib/libavdevice.a
 	${BUILD_DIR}/lib/libavfilter.a
@@ -318,7 +334,6 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
 	${BUILD_DIR}/lib/libxmp.a
 	${BUILD_DIR}/lib/libz.a
 	-Wl,--end-group
-	${LIB_LIST}
 	-pthread
 	-lm
 	-lstdc++
diff --git a/build-all.sh b/build-all.sh
index f45bc3658..34c7d9304 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -255,6 +255,7 @@ UNUSED
 	clearAndEnterBuild
 	cmake ${COMMON} ${G_BUILDROOT}
 	make
+	upx -9 singe2${SUFFIX}
 	mv -f singe2${SUFFIX} ../Singe-v2.10-${OS}-${ARCH}${SUFFIX}
 	popd
 }