diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-11 00:26:55 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-11 00:27:35 +0100 |
| commit | 5155aa40960c9dd6f8a8f55b5c711a9091820c3b (patch) | |
| tree | 3855d894cc2903fc09e992aca1c9155184445d4b | |
| parent | moved generating to globs (diff) | |
| download | cuberite-5155aa40960c9dd6f8a8f55b5c711a9091820c3b.tar cuberite-5155aa40960c9dd6f8a8f55b5c711a9091820c3b.tar.gz cuberite-5155aa40960c9dd6f8a8f55b5c711a9091820c3b.tar.bz2 cuberite-5155aa40960c9dd6f8a8f55b5c711a9091820c3b.tar.lz cuberite-5155aa40960c9dd6f8a8f55b5c711a9091820c3b.tar.xz cuberite-5155aa40960c9dd6f8a8f55b5c711a9091820c3b.tar.zst cuberite-5155aa40960c9dd6f8a8f55b5c711a9091820c3b.zip | |
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/cryptopp/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | 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) |