From a9f95ed1a2c4ac466623569415200091720c0eac Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 11 Sep 2019 08:24:00 +0200 Subject: [PATCH] Changed some comments and messages in CMakeLists.txt Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 6 +++--- DoConfig/CMakeLists.txt | 4 ++-- bin2h/CMakeLists.txt | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ed2508b..70f016e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ option(JAPANESE "Enable the Japanese-language build" 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(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) @@ -268,10 +268,10 @@ endif() # Make some tweaks if we're using 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() -# Build bin2h externally, so it isn't cross-compiled when CSE2 is (Emscripten) +# Build bin2h externally, so it isn't cross-compiled when we're cross-compiling CSE2 (Emscriptem, etc.) include(ExternalProject) ExternalProject_Add(bin2h diff --git a/DoConfig/CMakeLists.txt b/DoConfig/CMakeLists.txt index a2344cf8..fcf469b9 100644 --- a/DoConfig/CMakeLists.txt +++ b/DoConfig/CMakeLists.txt @@ -17,12 +17,12 @@ endif() # MSVC tweak 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() # Find FLTK 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) endif() diff --git a/bin2h/CMakeLists.txt b/bin2h/CMakeLists.txt index bca86b88..e621a836 100644 --- a/bin2h/CMakeLists.txt +++ b/bin2h/CMakeLists.txt @@ -16,8 +16,7 @@ set_target_properties(bin2h PROPERTIES # MSVC tweak if(MSVC) - target_compile_definitions(bin2h PRIVATE _CRT_SECURE_NO_WARNINGS) # Shut up those stupid warnings -endif() + 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 # Enable link-time optimisation if available if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")