From 0758e9f78ad228176fb73630512d03588f8b84c5 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 8 Aug 2010 12:41:22 +0200 Subject: [PATCH] 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 --- src/server/game/CMakeLists.txt | 10 ++++------ src/server/scripts/CMakeLists.txt | 16 +++++++++------- .../PrecompiledHeaders/ScriptPCH.cpp | 0 .../PrecompiledHeaders/ScriptPCH.h | 0 src/server/shared/CMakeLists.txt | 9 --------- 5 files changed, 13 insertions(+), 22 deletions(-) rename src/server/{game => scripts}/PrecompiledHeaders/ScriptPCH.cpp (100%) rename src/server/{game => scripts}/PrecompiledHeaders/ScriptPCH.h (100%) diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 64828b7a09e..9eaa359b6c2 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -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}) diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 951a4c7b52e..7d3de01f02b 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -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 diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.cpp b/src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp similarity index 100% rename from src/server/game/PrecompiledHeaders/ScriptPCH.cpp rename to src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.h b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h similarity index 100% rename from src/server/game/PrecompiledHeaders/ScriptPCH.h rename to src/server/scripts/PrecompiledHeaders/ScriptPCH.h diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index b5a23b1b7d4..85d8c1a971b 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -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}