Fixed compilation after dir rework

This commit is contained in:
Yehonal
2017-10-13 19:22:30 +02:00
parent b24a2ea13e
commit c64f8d8e82
75 changed files with 276 additions and 938 deletions

View File

@@ -12,8 +12,8 @@
file(GLOB_RECURSE sources *.cpp *.h)
set(include_Dirs
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/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/worldengine/deps/libmpq/win
${CMAKE_SOURCE_DIR}/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/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
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/deps/libmpq
${CMAKE_SOURCE_DIR}/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/worldengine/deps/libmpq/win
${CMAKE_SOURCE_DIR}/deps/libmpq/win
)
endif()

View File

@@ -15,30 +15,30 @@ set(mmap_gen_Includes
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${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/src/
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Maps
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/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}/modules/acore/game-framework/src/Addons
${CMAKE_SOURCE_DIR}/deps/libmpq
${CMAKE_SOURCE_DIR}/deps/zlib
${CMAKE_SOURCE_DIR}/deps/bzip2
${CMAKE_SOURCE_DIR}/deps/g3dlite/include
${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/src/libraries/collision/
${CMAKE_SOURCE_DIR}/src/libraries/collision/Management
${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps
${CMAKE_SOURCE_DIR}/src/libraries/collision/Models
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/Configuration
${CMAKE_SOURCE_DIR}/src/core/Cryptography
${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication
${CMAKE_SOURCE_DIR}/src/core/Database
${CMAKE_SOURCE_DIR}/src/core/DataStores
${CMAKE_SOURCE_DIR}/src/core/Debugging
${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference
${CMAKE_SOURCE_DIR}/src/core/Dynamic
${CMAKE_SOURCE_DIR}/src/core/Logging
${CMAKE_SOURCE_DIR}/src/core/Packets
${CMAKE_SOURCE_DIR}/src/core/Threading
${CMAKE_SOURCE_DIR}/src/core/Utilities
${CMAKE_SOURCE_DIR}/src/framework/Addons
${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/worldengine/deps/libmpq/win
${CMAKE_SOURCE_DIR}/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/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/src/
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Maps
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models
${CMAKE_SOURCE_DIR}/deps/g3dlite/include
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/Debugging
${CMAKE_SOURCE_DIR}/src/libraries/collision/
${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps
${CMAKE_SOURCE_DIR}/src/libraries/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/worldengine/deps/libmpq
${CMAKE_SOURCE_DIR}/deps/libmpq
)
if( WIN32 )
set(include_Dirs
${include_Dirs}
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
${CMAKE_SOURCE_DIR}/deps/libmpq/win
)
endif()