More cleaning for CMakeLists
Moved ScriptPCH from game directory to scripts --HG-- branch : trunk rename : src/server/game/PrecompiledHeaders/ScriptPCH.cpp => src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp rename : src/server/game/PrecompiledHeaders/ScriptPCH.h => src/server/scripts/PrecompiledHeaders/ScriptPCH.h
This commit is contained in:
@@ -90,14 +90,11 @@ set(game_STAT_SRCS
|
||||
${sources_World}
|
||||
)
|
||||
|
||||
if( MSVC )
|
||||
set(sources_PrecompiledHeaders
|
||||
PrecompiledHeaders/gamePCH.cpp
|
||||
PrecompiledHeaders/gamePCH.h
|
||||
)
|
||||
if(MSVC)
|
||||
set(game_STAT_SRCS
|
||||
${game_STAT_SRCS}
|
||||
${sources_PrecompiledHeaders}
|
||||
PrecompiledHeaders/gamePCH.cpp
|
||||
PrecompiledHeaders/gamePCH.h
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -190,6 +187,7 @@ include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src/server/game/Tools
|
||||
${CMAKE_SOURCE_DIR}/src/server/game/Weather
|
||||
${CMAKE_SOURCE_DIR}/src/server/game/World
|
||||
${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
|
||||
)
|
||||
|
||||
add_library(game STATIC ${game_STAT_SRCS})
|
||||
|
||||
@@ -40,6 +40,14 @@ set(scripts_STAT_SRCS
|
||||
../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
|
||||
)
|
||||
|
||||
if(MSVC)
|
||||
set(scripts_STAT_SRCS
|
||||
${scripts_STAT_SRCS}
|
||||
PrecompiledHeaders/scriptPCH.cpp
|
||||
PrecompiledHeaders/scriptPCH.h
|
||||
)
|
||||
endif()
|
||||
|
||||
message("-- Added Script Library to SCRIPTS lib")
|
||||
|
||||
include_directories(
|
||||
@@ -125,16 +133,10 @@ include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src/server/game/Tools
|
||||
${CMAKE_SOURCE_DIR}/src/server/game/Weather
|
||||
${CMAKE_SOURCE_DIR}/src/server/game/World
|
||||
${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
|
||||
${MYSQL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
# Add ScriptPCH.cpp to project on Windows
|
||||
if(MSVC)
|
||||
set(scripts_STAT_SRCS
|
||||
../game/PrecompiledHeaders/ScriptPCH.cpp
|
||||
${scripts_STAT_SRCS})
|
||||
endif()
|
||||
|
||||
add_library(scripts STATIC ${scripts_STAT_SRCS})
|
||||
|
||||
# Generate precompiled header
|
||||
|
||||
@@ -39,15 +39,6 @@ set(shared_STAT_SRCS
|
||||
${sources_localdir}
|
||||
)
|
||||
|
||||
# Windows specific files
|
||||
if(WIN32)
|
||||
set(shared_STAT_SRCS
|
||||
${shared_STAT_SRCS}
|
||||
Debugging/WheatyExceptionReport.cpp
|
||||
Utilities/ServiceWin32.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
include_directories(
|
||||
${ACE_INCLUDE_DIR}
|
||||
${MYSQL_INCLUDE_DIR}
|
||||
|
||||
Reference in New Issue
Block a user