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

Merge pull request #53 from GabrielRavier/betterCMakeMessages

Browse source 
Improve some comments and the option message for the renderer in the CMakeLists.txts
This commit is contained in:
Clownacy 2019-09-11 18:03:37 +01:00 • committed by GitHub
commit 5c040608cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -11,7 +11,7 @@ option(JAPANESE "Enable the Japanese-language build" OFF)
option(FIX_BUGS "Fix various bugs in the game" OFF) option(FIX_BUGS "Fix various bugs in the game" OFF)
option(DEBUG_SAVE "Re-enable the ability to drag-and-drop save files onto the window" OFF) option(DEBUG_SAVE "Re-enable the ability to drag-and-drop save files onto the window" OFF)
option(FORCE_LOCAL_LIBS "Compile the built-in versions of SDL2, FreeType, and FLTK instead of using the system-provided ones" OFF) option(FORCE_LOCAL_LIBS "Compile the built-in versions of SDL2, FreeType, and FLTK instead of using the system-provided ones" OFF)
set(RENDERER "Texture" CACHE STRING "Which renderer the game should use: 'OpenGL3' for an OpenGL 3.2 renderer, 'Texture' for SDL2's hardware-accelerated Texture API, 'Surface' for SDL2's software-rendered Surface API, and 'Software' for a handwritten software renderer") set(RENDERER "Texture" CACHE STRING "Which renderer the game should use: 'OpenGL3' for an OpenGL 3.2 renderer, 'Texture' for SDL2's hardware-accelerated Texture API, 'Surface' for SDL2's software-rendered Surface API, or 'Software' for a handwritten software renderer")
project(CSE2 LANGUAGES C CXX) project(CSE2 LANGUAGES C CXX)
@ -268,10 +268,10 @@ endif()
# Make some tweaks if we're using MSVC # Make some tweaks if we're using MSVC
if(MSVC) if(MSVC)
target_compile_definitions(CSE2 PRIVATE _CRT_SECURE_NO_WARNINGS) # Shut up those stupid warnings target_compile_definitions(CSE2 PRIVATE _CRT_SECURE_NO_WARNINGS) # Disable warnings that normally fire up on MSVC when using "unsafe" functions instead of using MSVC's "safe" _s functions
endif() endif()
# Build bin2h externally, so it isn't cross-compiled when CSE2 is (Emscripten) # Build bin2h externally, so it isn't cross-compiled when CSE2 is (Emscripten, cross-GCC, MinGW on Linux, etc.)
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(bin2h ExternalProject_Add(bin2h

4
DoConfig/CMakeLists.txt
View file

@ -17,12 +17,12 @@ endif()
# MSVC tweak # MSVC tweak
if(MSVC) if(MSVC)
target_compile_definitions(DoConfig PRIVATE _CRT_SECURE_NO_WARNINGS) # Shut up those stupid warnings target_compile_definitions(DoConfig PRIVATE _CRT_SECURE_NO_WARNINGS) # Disable warnings that normally fire up on MSVC when using "unsafe" functions instead of using MSVC's "safe" _s functions
endif() endif()
# Find FLTK # Find FLTK
if(NOT FORCE_LOCAL_LIBS) if(NOT FORCE_LOCAL_LIBS)
set(FLTK_SKIP_FLUID ON) set(FLTK_SKIP_FLUID ON) # Do not require fltk-fluid (the UI designer)
find_package(FLTK) find_package(FLTK)
endif() endif()

2
bin2h/CMakeLists.txt
View file

@ -16,7 +16,7 @@ set_target_properties(bin2h PROPERTIES
# MSVC tweak # MSVC tweak
if(MSVC) if(MSVC)
target_compile_definitions(bin2h PRIVATE _CRT_SECURE_NO_WARNINGS) # Shut up those stupid warnings target_compile_definitions(bin2h PRIVATE _CRT_SECURE_NO_WARNINGS) # Disable warnings that normally fire up on MSVC when using "unsafe" functions instead of using MSVC's "safe" _s functions
endif() endif()
# Enable link-time optimisation if available # Enable link-time optimisation if available