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

Correct stupid typos

Browse source 
...I didn't get much sleep, last night.
This commit is contained in:
Clownacy 2020-04-05 20:27:00 +01:00
parent 09fa34cbc7
commit b775003e94
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -474,18 +474,18 @@ if(BACKEND_PLATFORM MATCHES "SDL2" OR BACKEND_AUDIO MATCHES "SDL2")
# pkg-config # pkg-config
if (PKG_CONFIG_STATIC_LIBS) if (PKG_CONFIG_STATIC_LIBS)
message(STATUS "Using system SDL2 (pkg-config, static)") message(STATUS "Using system SDL2 (pkg-config, static)")
# Do not link libSDL3main.a, otherwise we get weird linker errors about SDL_main not being found. # Do not link libSDL2main.a, otherwise we get weird linker errors about SDL_main not being found.
# We don't need SDL2's WinMain->main shim anyway, so we can just ignore it. # We don't need SDL2's WinMain->main shim anyway, so we can just ignore it.
list(REMOVE_ITEM sdl2_STATIC_CFLAGS "-Dmain=SDL_main") list(REMOVE_ITEM sdl2_STATIC_CFLAGS "-Dmain=SDL_main")
list(REMOVE_ITEM sdl2_STATIC_LDFLAGS "-lSDLmain") list(REMOVE_ITEM sdl2_STATIC_LDFLAGS "-lSDL2main")
target_compile_options(CSE2 PRIVATE ${sdl2_STATIC_CFLAGS}) target_compile_options(CSE2 PRIVATE ${sdl2_STATIC_CFLAGS})
target_link_libraries(CSE2 PRIVATE ${sdl2_STATIC_LDFLAGS}) target_link_libraries(CSE2 PRIVATE ${sdl2_STATIC_LDFLAGS})
else() else()
message(STATUS "Using system SDL2 (pkg-config, dynamic)") message(STATUS "Using system SDL2 (pkg-config, dynamic)")
# Do not link libSDL3main.a, otherwise we get weird linker errors about SDL_main not being found. # Do not link libSDL2main.a, otherwise we get weird linker errors about SDL_main not being found.
# We don't need SDL2's WinMain->main shim anyway, so we can just ignore it. # We don't need SDL2's WinMain->main shim anyway, so we can just ignore it.
list(REMOVE_ITEM sdl2_CFLAGS "-Dmain=SDL_main") list(REMOVE_ITEM sdl2_CFLAGS "-Dmain=SDL_main")
list(REMOVE_ITEM sdl2_LDFLAGS "-lSDLmain") list(REMOVE_ITEM sdl2_LDFLAGS "-lSDL2main")
target_compile_options(CSE2 PRIVATE ${sdl2_CFLAGS}) target_compile_options(CSE2 PRIVATE ${sdl2_CFLAGS})
target_link_libraries(CSE2 PRIVATE ${sdl2_LDFLAGS}) target_link_libraries(CSE2 PRIVATE ${sdl2_LDFLAGS})
endif() endif()