duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid WinMain on Windows

Browse source 
This is a better for GLFW on Windows, and it might have fixed the
long-standing bug where FORCE_LOCAL_LIBS on MSYS2 wouldn't work
because SDL2 would mysteriously fail because of something involving
WinMain.
This commit is contained in:
Clownacy 2020-04-02 00:16:43 +01:00
parent 96f46f3387
commit cf0ee89e93
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -33,7 +33,7 @@ option(FORCE_LOCAL_LIBS "Compile the built-in versions of SDL2, FreeType, and FL
project(CSE2 LANGUAGES C CXX) project(CSE2 LANGUAGES C CXX)
add_executable(CSE2 add_executable(CSE2 WIN32
"${ASSETS_DIRECTORY}/resources/CSE2.rc" "${ASSETS_DIRECTORY}/resources/CSE2.rc"
"src/ArmsItem.cpp" "src/ArmsItem.cpp"
"src/ArmsItem.h" "src/ArmsItem.h"
@ -358,6 +358,9 @@ if(MSVC)
# Make it so source files are recognized as UTF-8 by MSVC # Make it so source files are recognized as UTF-8 by MSVC
target_compile_options(CSE2 PRIVATE "/utf-8") target_compile_options(CSE2 PRIVATE "/utf-8")
# Use `main` instead of `WinMain`
set_target_properties(CSE2 PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup")
endif() endif()
# On Windows, we use native icons instead # On Windows, we use native icons instead
@ -464,11 +467,11 @@ if(BACKEND_PLATFORM MATCHES "SDL2" OR BACKEND_AUDIO MATCHES "SDL2")
elseif(TARGET SDL2::SDL2) elseif(TARGET SDL2::SDL2)
# CMake-generated config (Arch, vcpkg, Raspbian) # CMake-generated config (Arch, vcpkg, Raspbian)
message(STATUS "Using system SDL2 (CMake, dynamic)") message(STATUS "Using system SDL2 (CMake, dynamic)")
target_link_libraries(CSE2 PRIVATE SDL2::SDL2 SDL2::SDL2main) target_link_libraries(CSE2 PRIVATE SDL2::SDL2)
elseif(TARGET SDL2::SDL2-static) elseif(TARGET SDL2::SDL2-static)
# CMake-generated config (Arch, vcpkg, Raspbian) # CMake-generated config (Arch, vcpkg, Raspbian)
message(STATUS "Using system SDL2 (CMake, static)") message(STATUS "Using system SDL2 (CMake, static)")
target_link_libraries(CSE2 PRIVATE SDL2::SDL2-static SDL2::SDL2main) target_link_libraries(CSE2 PRIVATE SDL2::SDL2-static)
elseif(SDL2_FOUND) elseif(SDL2_FOUND)
# Autotools-generated config (MSYS2) # Autotools-generated config (MSYS2)
message(STATUS "Using system SDL2 (Autotools)") message(STATUS "Using system SDL2 (Autotools)")
@ -482,7 +485,7 @@ if(BACKEND_PLATFORM MATCHES "SDL2" OR BACKEND_AUDIO MATCHES "SDL2")
set(LIBC ON CACHE INTERNAL "" FORCE) # Needed to prevent possible 'symbol already defined' errors set(LIBC ON CACHE INTERNAL "" FORCE) # Needed to prevent possible 'symbol already defined' errors
endif() endif()
add_subdirectory("external/SDL2" EXCLUDE_FROM_ALL) add_subdirectory("external/SDL2" EXCLUDE_FROM_ALL)
target_link_libraries(CSE2 PRIVATE SDL2-static SDL2main) target_link_libraries(CSE2 PRIVATE SDL2-static)
endif() endif()
endif() endif()