Compilation fix

This commit is contained in:
Yehonal 2016-08-23 14:23:45 +02:00
parent 85b8aa7ce8
commit 5fa9ed6f28
6 changed files with 11 additions and 7 deletions

View file

@ -38,10 +38,10 @@ set(mmap_gen_Includes
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons
${CMAKE_SOURCE_DIR}/src/game ${CMAKE_SOURCE_DIR}/src/game
${CMAKE_SOURCE_DIR}/src/game/Accounts ${CMAKE_SOURCE_DIR}/src/game/Accounts
${CMAKE_SOURCE_DIR}/src/game/Achievements ${CMAKE_SOURCE_DIR}/src/game/Achievements
${CMAKE_SOURCE_DIR}/src/game/Addons
${CMAKE_SOURCE_DIR}/src/game/AI ${CMAKE_SOURCE_DIR}/src/game/AI
${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI

View file

@ -2,6 +2,7 @@ if( USE_COREPCH )
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
endif() endif()
file(GLOB_RECURSE sources_Addons Addons/*.cpp Addons/*.h)
file(GLOB sources_localdir *.cpp *.h) file(GLOB sources_localdir *.cpp *.h)
# Build gamefw sourcelist # Build gamefw sourcelist
@ -14,6 +15,7 @@ endif()
set(gamefw_STAT_SRCS set(gamefw_STAT_SRCS
${gamefw_STAT_SRCS} ${gamefw_STAT_SRCS}
${sources_Addons}
${sources_localdir} ${sources_localdir}
) )

View file

@ -0,0 +1,2 @@
add_subdirectory(src)

View file

@ -46,7 +46,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
${CMAKE_SOURCE_DIR}/src/game/Addons ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons
${CMAKE_SOURCE_DIR}/src/game/Conditions ${CMAKE_SOURCE_DIR}/src/game/Conditions
${CMAKE_SOURCE_DIR}/src/game/Entities/Item ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject

View file

@ -92,14 +92,14 @@ include_directories(
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Management ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons
${CMAKE_SOURCE_DIR}/src/game/Accounts ${CMAKE_SOURCE_DIR}/src/game/Accounts
${CMAKE_SOURCE_DIR}/src/game/Achievements ${CMAKE_SOURCE_DIR}/src/game/Achievements
${CMAKE_SOURCE_DIR}/src/game/Addons
${CMAKE_SOURCE_DIR}/src/game/AI ${CMAKE_SOURCE_DIR}/src/game/AI
${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI

View file

@ -64,10 +64,10 @@ include_directories(
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons
${CMAKE_SOURCE_DIR}/src/game ${CMAKE_SOURCE_DIR}/src/game
${CMAKE_SOURCE_DIR}/src/game/Accounts ${CMAKE_SOURCE_DIR}/src/game/Accounts
${CMAKE_SOURCE_DIR}/src/game/Achievements ${CMAKE_SOURCE_DIR}/src/game/Achievements
${CMAKE_SOURCE_DIR}/src/game/Addons
${CMAKE_SOURCE_DIR}/src/game/AI ${CMAKE_SOURCE_DIR}/src/game/AI
${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI