From 5155aa40960c9dd6f8a8f55b5c711a9091820c3b Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Dec 2013 23:26:55 +0000 Subject: [PATCH] added zlib --- CMakeLists.txt | 1 + lib/cryptopp/CMakeLists.txt | 1 - src/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75eb77fcf..1dca91a85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ set(CMAKE_BUILD_TYPE "Release") add_subdirectory(lib/inifile/) add_subdirectory(lib/jsoncpp/) add_subdirectory(lib/cryptopp/) +add_subdirectory(lib/zlib/) #TODo: set -Wall -Werror -Wextra set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK}") diff --git a/lib/cryptopp/CMakeLists.txt b/lib/cryptopp/CMakeLists.txt index e0e65c818..3497b3346 100644 --- a/lib/cryptopp/CMakeLists.txt +++ b/lib/cryptopp/CMakeLists.txt @@ -8,7 +8,6 @@ endif() include_directories ("${PROJECT_SOURCE_DIR}/../../src/") file(GLOB cryptopp_SRC - "*.h" "*.cpp" ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index afec03e8a..b2376731e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,4 +33,4 @@ add_executable(../MCServer/MCServer ${SOURCE}) target_link_libraries(../MCServer/MCServer OSSupport HTTPServer iniFile Bindings Items Blocks) target_link_libraries(../MCServer/MCServer Protocol Generating WorldStorage jsoncpp cryptopp) -target_link_libraries(../MCServer/MCServer Mobs Entities Simulator UI) +target_link_libraries(../MCServer/MCServer Mobs Entities Simulator UI zlib)