commit 40989ad4

sago007 · 2017-12-05 22:15
40989ad4c7d2574ed678076680e56e01ba1e5ad7 patch · browse files
parent e1b2e65372f9a242fc56c484229a078572057af3

Removed warning from newer versions of GCC related to the Cereal

Changed files

M	CMakeLists.txt before
M	source/code/stageclearhandler.cpp before

diff --git a/CMakeLists.txt b/CMakeLists.txt index 821c24f..7a93842 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -46,6 +46,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG} -g -DDEBUG")

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} -O2")

+#Newer versions of gcc fails for Cereal.

+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-fallthrough")

#Setup SDL2

find_package(SDL2 REQUIRED)

include_directories(${SDL2_INCLUDE_DIR})

diff --git a/source/code/stageclearhandler.cpp b/source/code/stageclearhandler.cpp index 83b2ef4..f157fd7 100644 --- a/source/code/stageclearhandler.cpp +++ b/source/code/stageclearhandler.cpp

@@ -30,7 +30,6 @@ http://www.blockattack.net

#include "cereal/types/vector.hpp"

#include "cereal/archives/json.hpp"

#include "sago/SagoMisc.hpp"

-#include "Libs/include/cereal/details/helpers.hpp"

//paths

const char* const stageClearSaveName = "stageClear.json.SCsave";