Project restructuring [PART.2]

This commit is contained in:
Yehonal
2016-08-23 12:11:46 +02:00
parent 54bd100573
commit 0355064321
141 changed files with 250 additions and 243 deletions

View File

@@ -1,17 +0,0 @@
CU_RUN_HOOK("BEFORE_ACORE_LOAD")
add_subdirectory(deps)
if( SERVERS )
add_subdirectory(framework)
add_subdirectory(world-engine/collision)
else()
if( TOOLS )
add_subdirectory(extractors)
add_subdirectory(world-engine/collision)
add_subdirectory(framework)
endif()
endif()
CU_RUN_HOOK("AFTER_ACORE_LOAD")

View File

@@ -12,8 +12,8 @@
file(GLOB_RECURSE sources *.cpp *.h)
set(include_Dirs
${CMAKE_SOURCE_DIR}/modules/acore/framework
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/loadlib
)
@@ -21,7 +21,7 @@ set(include_Dirs
if( WIN32 )
set(include_Dirs
${include_Dirs}
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
)
endif()

View File

@@ -13,11 +13,11 @@ file(GLOB_RECURSE meshExtract_Sources *.cpp *.h)
set(include_Base
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/modules/acore/framework
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
${ACE_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
@@ -25,7 +25,7 @@ set(include_Base
if( WIN32 )
set(include_Base
${include_Base}
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
)
endif()

View File

@@ -15,29 +15,29 @@ set(mmap_gen_Includes
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Management
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
${CMAKE_SOURCE_DIR}/modules/acore/framework
${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography
${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography/Authentication
${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Management
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Maps
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
${CMAKE_SOURCE_DIR}/src/game
${CMAKE_SOURCE_DIR}/src/game/Accounts
${CMAKE_SOURCE_DIR}/src/game/Achievements
@@ -111,7 +111,7 @@ set(mmap_gen_Includes
if( WIN32 )
set(mmap_gen_Includes
${mmap_gen_Includes}
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
)
endif()

View File

@@ -10,12 +10,12 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
include_directories(
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
${CMAKE_SOURCE_DIR}/modules/acore/framework
${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Maps
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
${ACE_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
)

View File

@@ -12,13 +12,13 @@
file(GLOB_RECURSE sources *.cpp *.h)
set(include_Dirs
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
)
if( WIN32 )
set(include_Dirs
${include_Dirs}
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
)
endif()