From 6a58d2a59d6f243ad22dc832d029980d3b6ac58d Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sun, 19 Jan 2014 04:48:47 -0700 Subject: [PATCH] Added missing include paths and linked libs --- CMakeLists.txt | 3 ++- .../application/CentralServer/src/CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a11d928..9924226f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(swgnge CXX) +project(swgnge C CXX) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -17,6 +17,7 @@ find_package(Oracle REQUIRED) find_package(PCRE REQUIRED) find_package(Perl REQUIRED) find_package(STLPort REQUIRED) +find_package(Threads) find_package(ZLIB REQUIRED) if(WIN32) diff --git a/engine/server/application/CentralServer/src/CMakeLists.txt b/engine/server/application/CentralServer/src/CMakeLists.txt index 86b28480..d437c464 100644 --- a/engine/server/application/CentralServer/src/CMakeLists.txt +++ b/engine/server/application/CentralServer/src/CMakeLists.txt @@ -106,7 +106,15 @@ if(WIN32) else() set(PLATFORM_SOURCES linux/main.cpp + shared/AuctionTransferGameAPI/Base/linux/Archive.h + shared/AuctionTransferGameAPI/Base/linux/Mutex.cpp + shared/AuctionTransferGameAPI/Base/linux/Mutex.h + shared/AuctionTransferGameAPI/Base/linux/Platform.cpp + shared/AuctionTransferGameAPI/Base/linux/Platform.h + shared/AuctionTransferGameAPI/Base/linux/Types.h ) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shared/AuctionTransferGameAPI/Base/linux) endif() add_definitions(-DEXTERNAL_DISTRO -DNAMESPACE=AuctionTransfer -DUSE_TCP_LIBRARY) @@ -143,6 +151,9 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public + ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/platform/projects + ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/platform/utils + ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary ) link_directories(${STLPORT_LIBDIR}) @@ -182,7 +193,10 @@ target_link_libraries(CentralServer unicode unicodeArchive udplibrary + ${STLPORT_LIBRARIES} ${ZLIB_LIBRARY} + ${CMAKE_THREAD_LIBS_INIT} + ${CMAKE_DL_LIBS} ) if(WIN32)