shithub: cstory

Info  •  Files  •  Log  •  Branches

Merge branch 'accurate' into portable

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -16,9 +16,9 @@

 option(DEBUG_SAVE "Re-enable the ability to drag-and-drop save files onto the window" OFF)

 set(RENDERER "SDLTexture" CACHE STRING "Which renderer the game should use: 'OpenGL3' for an OpenGL 3.2 renderer, 'SDLTexture' for SDL2's hardware-accelerated Texture API, 'SDLSurface' for SDL2's software-rendered Surface API, or 'Software' for a handwritten software renderer")

-option(WARNINGS "Enable common compiler warnings (for gcc-compatible compilers and MSVC only)" OFF)

-option(WARNINGS_ALL "Enable ALL compiler warnings (for clang and MSVC only)" OFF)

-option(WARNINGS_FATAL "Stop compilation on any compiler warning (for gcc-compatible compilers and MSVC only)" OFF)

+option(WARNINGS "Enable common compiler warnings (for GCC-compatible compilers and MSVC only)" OFF)

+option(WARNINGS_ALL "Enable ALL compiler warnings (for Clang and MSVC only)" OFF)

+option(WARNINGS_FATAL "Stop compilation on any compiler warning (for GCC-compatible compilers and MSVC only)" OFF)

 option(FORCE_LOCAL_LIBS "Compile the built-in versions of SDL2, FreeType, and FLTK instead of using the system-provided ones" OFF)

 project(CSE2 LANGUAGES C CXX)

@@ -29,13 +29,13 @@

 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")

 	# Using Clang (this is a match so that we also get "AppleClang" which is the Apple-provided Clang

 	set(COMPILER_IS_CLANG true)

-	message(STATUS "Compiling with clang")

+	message(STATUS "Compiling with Clang")

 endif()

 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

 	# Using GCC

 	set(COMPILER_IS_GCC true)

-	message(STATUS "Compiling with gcc")

+	message(STATUS "Compiling with GCC")

 endif()

 if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")

--- a/Makefile

+++ b/Makefile

@@ -57,7 +57,7 @@

 ifeq ($(WARNINGS_ALL), 1)

   ifneq ($(findstring clang,$(CXX)),)

-    # Use clang-specific flag -Weverything

+    # Use Clang-specific flag -Weverything

     ALL_CFLAGS += -Weverything

     ALL_CXXFLAGS += -Weverything

   else

--- a/README.md

+++ b/README.md

@@ -101,7 +101,7 @@

 `RENDERER=SDLSurface` | Use the software-rendered SDL2 Surface API renderer

 `RENDERER=Software` | Use the hand-written software renderer

 `WARNINGS=1` | Enable common compiler warnings

-`WARNINGS_ALL=1` | Enable ALL compiler warnings (clang only)

+`WARNINGS_ALL=1` | Enable ALL compiler warnings (Clang only)

 `WARNINGS_FATAL=1` | Make all compiler warnings errors

 Once built, the executables and assets can be found in the newly-generated `game` folder.

-- 

⑨