More CMakeLists.txt fixes.
Now the repo is compilable with cmake if you manage to bypass some libACE problems (If you have system-wide libACE feel free to remove the dep/include/ace directory if it fucks you) --HG-- branch : trunk
This commit is contained in:
@@ -19,8 +19,8 @@ SET(trinityauth_STAT_SRCS
|
||||
include_directories(
|
||||
${ACE_INCLUDE_DIR}
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/src/shared
|
||||
${CMAKE_SOURCE_DIR}/src/framework
|
||||
${CMAKE_SOURCE_DIR}/src/server/shared
|
||||
${CMAKE_SOURCE_DIR}/src/server/framework
|
||||
${MYSQL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ SET(trinityconfig_STAT_SRCS
|
||||
include_directories(
|
||||
${ACE_INCLUDE_DIR}
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/src/shared
|
||||
${CMAKE_SOURCE_DIR}/src/framework
|
||||
${CMAKE_SOURCE_DIR}/src/server/shared
|
||||
${CMAKE_SOURCE_DIR}/src/server/framework
|
||||
)
|
||||
|
||||
add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
|
||||
|
||||
@@ -24,6 +24,7 @@ include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src/server/shared
|
||||
${CMAKE_SOURCE_DIR}/src/server/shared/Database
|
||||
${CMAKE_SOURCE_DIR}/src/server/framework
|
||||
${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
|
||||
${MYSQL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "Config/ConfigEnv.h"
|
||||
|
||||
#include "Common.h"
|
||||
#include "../../game/UpdateFields.h"
|
||||
#include "UpdateFields.h"
|
||||
|
||||
#include "Util.h"
|
||||
#include "Policies/SingletonImp.h"
|
||||
|
||||
@@ -23,7 +23,7 @@ SET(vmaps_STAT_SRCS
|
||||
|
||||
include_directories(
|
||||
${ACE_INCLUDE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/src/framework
|
||||
${CMAKE_SOURCE_DIR}/src/server/framework
|
||||
${CMAKE_SOURCE_DIR}/dep/include/g3dlite
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user