From a9f95ed1a2c4ac466623569415200091720c0eac Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 11 Sep 2019 08:24:00 +0200 Subject: [PATCH 1/6] 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") From d4ce0839bb98c2f9840e71fb065ddc1961e63e27 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 11 Sep 2019 13:33:09 +0200 Subject: [PATCH 2/6] Forgot endif() in bin2h/CMakeLists.txt Signed-off-by: Gabriel Ravier --- bin2h/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/bin2h/CMakeLists.txt b/bin2h/CMakeLists.txt index e621a836..f4dbd025 100644 --- a/bin2h/CMakeLists.txt +++ b/bin2h/CMakeLists.txt @@ -17,6 +17,7 @@ set_target_properties(bin2h PROPERTIES # MSVC tweak if(MSVC) 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() # Enable link-time optimisation if available if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") From 7176bcab9e0640f141e3697c16cac61dd47330b4 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 11 Sep 2019 13:37:34 +0200 Subject: [PATCH 3/6] Added more detail to the cross-compile comment Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70f016e9..09057d09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -271,7 +271,7 @@ if(MSVC) 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 we're cross-compiling CSE2 (Emscriptem, etc.) +# Build bin2h externally, so it isn't cross-compiled when we're cross-compiling CSE2 (Emscriptem, cross-gcc, mingw on Linux, etc.) include(ExternalProject) ExternalProject_Add(bin2h From d686152e84444a7721502fd628452738bef5ade4 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 11 Sep 2019 14:11:01 +0200 Subject: [PATCH 4/6] Fixed question not being a question, "Emscriptem" and saying "cross-compiled" twice Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09057d09..1bba697c 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 or 'Software' for a handwritten software renderer ?") +set(RENDERER "Texture" CACHE STRING "Which renderer the game should use, the options being : '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 ") project(CSE2 LANGUAGES C CXX) @@ -271,7 +271,7 @@ if(MSVC) 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 we're cross-compiling CSE2 (Emscriptem, cross-gcc, mingw on Linux, etc.) +# Build bin2h externally, so it isn't cross-compiled when CSE2 is (Emscripten, cross-gcc, mingw on Linux, etc.) include(ExternalProject) ExternalProject_Add(bin2h From dd190bd27631806aac8f1195dcad52204ec8c712 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 11 Sep 2019 14:32:48 +0200 Subject: [PATCH 5/6] Remove option change, wrote "cross-gcc" as "cross-GCC" and "mingw" as "MinGW" Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bba697c..6f2f705a 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, the options being : '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 and 'Software' for a handwritten software renderer") project(CSE2 LANGUAGES C CXX) @@ -271,7 +271,7 @@ if(MSVC) 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, cross-gcc, mingw on Linux, etc.) +# Build bin2h externally, so it isn't cross-compiled when CSE2 is (Emscripten, cross-GCC, MinGW on Linux, etc.) include(ExternalProject) ExternalProject_Add(bin2h From c9b248ba6489031e5d0eb35765711c1b8303a319 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 11 Sep 2019 19:01:36 +0200 Subject: [PATCH 6/6] Removed space before ':' and re-added comma before or Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f2f705a..9b17977a 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)