From 20fe039b1622e05b55563019c6c0f54afba86606 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 19 Dec 2016 21:35:02 +0100
Subject: [PATCH] use joint clibs directory instead of quicklist/critbit.

---
 CMakeLists.txt     | 3 +--
 clibs              | 2 +-
 src/CMakeLists.txt | 9 +++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d60d3d721..cc7e8173d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,8 +68,7 @@ add_subdirectory (cutest)
 add_subdirectory (cJSON)
 add_subdirectory (storage)
 add_subdirectory (iniparser)
-add_subdirectory (quicklist)
-add_subdirectory (critbit)
+add_subdirectory (clibs)
 add_subdirectory (process)
 add_subdirectory (src eressea)
 install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml")
diff --git a/clibs b/clibs
index f44b3e4e5..67e60390a 160000
--- a/clibs
+++ b/clibs
@@ -1 +1 @@
-Subproject commit f44b3e4e5f08633e21e701b9af70927b707f38ab
+Subproject commit 67e60390a2e324c4b0a015bda3ca9a956c98343f
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8a4445b55..ea76d4dbb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,10 +2,9 @@ cmake_minimum_required(VERSION 2.8)
 project (server C)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-include_directories (${CRITBIT_INCLUDE_DIR})
 include_directories (${CJSON_INCLUDE_DIR})
+include_directories (${CLIBS_INCLUDE_DIR})
 include_directories (${STORAGE_INCLUDE_DIR})
-include_directories (${QUICKLIST_INCLUDE_DIR})
 include_directories (${CUTEST_INCLUDE_DIR})
 include_directories (${LUA_INCLUDE_DIR})
 include_directories (${TOLUA_INCLUDE_DIR})
@@ -181,9 +180,8 @@ target_link_libraries(eressea
   game
   ${TOLUA_LIBRARIES}
   ${LUA_LIBRARIES}
-  ${QUICKLIST_LIBRARIES}
   ${STORAGE_LIBRARIES}
-  ${CRITBIT_LIBRARIES}
+  ${CLIBS_LIBRARIES}
   ${CJSON_LIBRARIES}
   ${INIPARSER_LIBRARIES}
 )
@@ -239,9 +237,8 @@ target_link_libraries(test_eressea
   game
   ${CUTEST_LIBRARIES}
   ${LUA_LIBRARIES}
-  ${QUICKLIST_LIBRARIES}
+  ${CLIBS_LIBRARIES}
   ${STORAGE_LIBRARIES}
-  ${CRITBIT_LIBRARIES}
   ${CJSON_LIBRARIES}
   ${INIPARSER_LIBRARIES}
   )