Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use joint clibs directory instead of quicklist/critbit.

This commit is contained in:
Enno Rehling 2016-12-19 21:35:02 +01:00
parent 752b6526bd
commit 20fe039b16
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -68,8 +68,7 @@ add_subdirectory (cutest)
add_subdirectory (cJSON) add_subdirectory (cJSON)
add_subdirectory (storage) add_subdirectory (storage)
add_subdirectory (iniparser) add_subdirectory (iniparser)
add_subdirectory (quicklist) add_subdirectory (clibs)
add_subdirectory (critbit)
add_subdirectory (process) add_subdirectory (process)
add_subdirectory (src eressea) add_subdirectory (src eressea)
install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml") install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml")

2
clibs

@ -1 +1 @@
Subproject commit f44b3e4e5f08633e21e701b9af70927b707f38ab Subproject commit 67e60390a2e324c4b0a015bda3ca9a956c98343f

9
src/CMakeLists.txt
View File

@ -2,10 +2,9 @@ cmake_minimum_required(VERSION 2.8)
project (server C) project (server C)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}) include_directories (${CMAKE_CURRENT_SOURCE_DIR})
include_directories (${CRITBIT_INCLUDE_DIR})
include_directories (${CJSON_INCLUDE_DIR}) include_directories (${CJSON_INCLUDE_DIR})
include_directories (${CLIBS_INCLUDE_DIR})
include_directories (${STORAGE_INCLUDE_DIR}) include_directories (${STORAGE_INCLUDE_DIR})
include_directories (${QUICKLIST_INCLUDE_DIR})
include_directories (${CUTEST_INCLUDE_DIR}) include_directories (${CUTEST_INCLUDE_DIR})
include_directories (${LUA_INCLUDE_DIR}) include_directories (${LUA_INCLUDE_DIR})
include_directories (${TOLUA_INCLUDE_DIR}) include_directories (${TOLUA_INCLUDE_DIR})
@ -181,9 +180,8 @@ target_link_libraries(eressea
game game
${TOLUA_LIBRARIES} ${TOLUA_LIBRARIES}
${LUA_LIBRARIES} ${LUA_LIBRARIES}
${QUICKLIST_LIBRARIES}
${STORAGE_LIBRARIES} ${STORAGE_LIBRARIES}
${CRITBIT_LIBRARIES} ${CLIBS_LIBRARIES}
${CJSON_LIBRARIES} ${CJSON_LIBRARIES}
${INIPARSER_LIBRARIES} ${INIPARSER_LIBRARIES}
) )
@ -239,9 +237,8 @@ target_link_libraries(test_eressea
game game
${CUTEST_LIBRARIES} ${CUTEST_LIBRARIES}
${LUA_LIBRARIES} ${LUA_LIBRARIES}
${QUICKLIST_LIBRARIES} ${CLIBS_LIBRARIES}
${STORAGE_LIBRARIES} ${STORAGE_LIBRARIES}
${CRITBIT_LIBRARIES}
${CJSON_LIBRARIES} ${CJSON_LIBRARIES}
${INIPARSER_LIBRARIES} ${INIPARSER_LIBRARIES}
) )