commit cabda704

Poul Sander · 2017-01-09 17:28
cabda704af0acac607bc602f1d00b57b873b0b9c patch · browse files
parent 7c8588cdd96d5a1a28c17dbea56e250b8c4c70e9

Fix for jsoncpp include.

Changed files

M	CMakeLists.txt before
M	source/code/sago/SagoSpriteHolder.cpp before

diff --git a/CMakeLists.txt b/CMakeLists.txt index c4bcfb9..20f3f3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -56,6 +56,9 @@ pkg_search_module(SDL2MIXER REQUIRED SDL2_mixer)

pkg_search_module(SDL2IMAGE REQUIRED SDL2_image)

pkg_search_module(SDL2TTF REQUIRED SDL2_ttf)

+pkg_search_module(JSONCPP REQUIRED jsoncpp)

+include_directories(${JSONCPP_INCLUDE_DIRS})

find_package(Boost COMPONENTS program_options REQUIRED)

#Find all sources but one

@@ -72,8 +75,9 @@ include_directories("source/code/Libs/include")

#building/compiling/linking

add_executable(blockattack ${GUI_TYPE} ${SOURCES} ${RES_FILES})

target_link_libraries( blockattack ${SDL2_LIBRARY})

-target_link_libraries( blockattack physfs jsoncpp)

+target_link_libraries( blockattack physfs)

target_link_libraries( blockattack ${SDL2MIXER_LIBRARIES} ${SDL2IMAGE_LIBRARIES} ${SDL2TTF_LIBRARIES})

+target_link_libraries( blockattack ${JSONCPP_LIBRARIES} )

target_link_libraries( blockattack ${Boost_LIBRARIES} )

set_target_properties( blockattack PROPERTIES RUNTIME_OUTPUT_DIRECTORY Game)

diff --git a/source/code/sago/SagoSpriteHolder.cpp b/source/code/sago/SagoSpriteHolder.cpp index 5b2f99c..2e50864 100644 --- a/source/code/sago/SagoSpriteHolder.cpp +++ b/source/code/sago/SagoSpriteHolder.cpp

@@ -26,11 +26,7 @@ SOFTWARE.

#include "SagoMisc.hpp"

#include <memory>

#include <unordered_map>

-#ifndef _WIN32

-#include <jsoncpp/json/json.h>

-#else

#include <json/json.h>

-#endif

#include <iostream>

#include <string.h>

#include <boost/algorithm/string/predicate.hpp>