shithub: cstory

Info  •  Files  •  Log  •  Branches

Merge pull request #53 from GabrielRavier/betterCMakeMessages

Improve some comments and the option message for the renderer in the CMakeLists.txts

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -11,7 +11,7 @@

 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 @@

 # 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 CSE2 is (Emscripten, cross-GCC, MinGW on Linux, etc.)

 include(ExternalProject)

 ExternalProject_Add(bin2h

--- a/DoConfig/CMakeLists.txt

+++ b/DoConfig/CMakeLists.txt

@@ -17,12 +17,12 @@

 # 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()

--- a/bin2h/CMakeLists.txt

+++ b/bin2h/CMakeLists.txt

@@ -16,7 +16,7 @@

 # MSVC tweak

 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()

 # Enable link-time optimisation if available

-- 

⑨