Windows is building again.

This commit is contained in:
Scott Duensing 2023-10-25 17:44:15 -05:00
parent 62d2a5344f
commit 59c7ef3ec8
2 changed files with 25 additions and 9 deletions

View file

@ -243,6 +243,20 @@ add_executable(${CMAKE_PROJECT_NAME}
#add_dependencies(${CMAKE_PROJECT_NAME} BUILD_PREREQS) #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 target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
${BUILD_DIR} ${BUILD_DIR}
${BUILD_DIR}/include ${BUILD_DIR}/include
@ -261,28 +275,30 @@ if(WIN32)
-mwindows -mwindows
-static -static
-lmingw32 -lmingw32
-lbcrypt -latomic
-ldinput8 -lole32
-ldxguid
-ldxerr8
-luser32 -luser32
-lkernel32
-lgdi32 -lgdi32
-lwinmm -lwinmm
-limm32 -limm32
-lole32
-loleaut32 -loleaut32
-lshell32
-lsetupapi
-lversion -lversion
-luuid -luuid
-ladvapi32
-lsetupapi
-lshell32
-ldinput8
-lws2_32
-lbcrypt
-lssp -lssp
-Dmain=SDL_main
) )
else() else()
set(LIB_LIST) set(LIB_LIST)
endif() endif()
target_link_libraries(${CMAKE_PROJECT_NAME} target_link_libraries(${CMAKE_PROJECT_NAME}
-Wl,--start-group -Wl,--start-group
${LIB_LIST}
${BUILD_DIR}/lib/libavcodec.a ${BUILD_DIR}/lib/libavcodec.a
${BUILD_DIR}/lib/libavdevice.a ${BUILD_DIR}/lib/libavdevice.a
${BUILD_DIR}/lib/libavfilter.a ${BUILD_DIR}/lib/libavfilter.a
@ -318,7 +334,6 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
${BUILD_DIR}/lib/libxmp.a ${BUILD_DIR}/lib/libxmp.a
${BUILD_DIR}/lib/libz.a ${BUILD_DIR}/lib/libz.a
-Wl,--end-group -Wl,--end-group
${LIB_LIST}
-pthread -pthread
-lm -lm
-lstdc++ -lstdc++

View file

@ -255,6 +255,7 @@ UNUSED
clearAndEnterBuild clearAndEnterBuild
cmake ${COMMON} ${G_BUILDROOT} cmake ${COMMON} ${G_BUILDROOT}
make make
upx -9 singe2${SUFFIX}
mv -f singe2${SUFFIX} ../Singe-v2.10-${OS}-${ARCH}${SUFFIX} mv -f singe2${SUFFIX} ../Singe-v2.10-${OS}-${ARCH}${SUFFIX}
popd popd
} }