commit 1f6aecf9

sago007 · 2016-02-20 12:53
1f6aecf9a0c5cd18af6adcf67330a62212533d39 patch · browse files
parent a1072daf3d07a62e26886bdb00424f3f277fcddf

BlockGame.cpp is now compiled instead of being included

Changed files

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

diff --git a/CMakeLists.txt b/CMakeLists.txt index dafd912..8d7acc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -51,7 +51,7 @@ find_package(Boost COMPONENTS program_options REQUIRED)

#Find all sources but one

file(GLOB SOURCES "source/code/*.cpp" "source/code/*/*.cpp" "source/code/Libs/*.c")

#I am still trying to get BlockGame to compile as a source file

-list(REMOVE_ITEM SOURCES "${blockattack_SOURCE_DIR}/source/code/BlockGame.cpp")

+#list(REMOVE_ITEM SOURCES "${blockattack_SOURCE_DIR}/source/code/BlockGame.cpp")

#Some messages to figure out what cmake does

message("${SOURCES}")

diff --git a/source/code/main.cpp b/source/code/main.cpp index 57b31c2..eb1613f 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -552,7 +552,6 @@ static TextManager theTextManager;

//Here comes the Block Game object

#include "BlockGame.hpp"

-#include "BlockGame.cpp"

#include "os.hpp"

#include "sago/SagoMiscSdl2.hpp"

#include "ScoresDisplay.hpp"