8 files changed, 25 insertions, 9 deletions
diff --git a/cmake/macros/FindPCHSupport.cmake b/cmake/macros/FindPCHSupport.cmake
index 9cc39a13b04..f58634bb407 100644
--- a/cmake/macros/FindPCHSupport.cmake
+++ b/cmake/macros/FindPCHSupport.cmake
@@ -78,7 +78,7 @@ FUNCTION(GENERATE_CXX_PCH_COMMAND TARGET_NAME_LIST INCLUDE_FLAGS IN PCH_SRC OUT)
   ADD_CUSTOM_COMMAND(
     OUTPUT ${OUT}
     COMMAND ${CMAKE_CXX_COMPILER}
-    ARGS ${DEFINITION_FLAGS} ${COMPILE_FLAGS} ${INCLUDE_FLAGS} -x c++-header ${IN} -o ${OUT}
+    ARGS ${DEFINITION_FLAGS} ${COMPILE_FLAGS} ${INCLUDE_FLAGS} -x c++-header -c ${IN} -o ${OUT}
     DEPENDS ${IN} ${PCH_SRC_N}_dephelp
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   )
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 626e1706098..3e238a8c367 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -26,6 +26,9 @@ list(APPEND PRIVATE_SOURCES
 if (USE_COREPCH)
   set(PRIVATE_PCH_HEADER PrecompiledHeaders/commonPCH.h)
   set(PRIVATE_PCH_SOURCE PrecompiledHeaders/commonPCH.cpp)
+  if (MSVC)
+    list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/commonPCH.cpp)
+  endif (MSVC)
 endif (USE_COREPCH)
 
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
@@ -33,7 +36,6 @@ GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 add_definitions(-DTRINITY_API_EXPORT_COMMON)
 
 add_library(common
-  ${PRIVATE_PCH_SOURCE}
   ${PRIVATE_SOURCES}
 )
 
diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
index 35ea16db522..0520bc9dca5 100644
--- a/src/server/bnetserver/CMakeLists.txt
+++ b/src/server/bnetserver/CMakeLists.txt
@@ -26,12 +26,14 @@ endif()
 if (USE_COREPCH)
   set(PRIVATE_PCH_HEADER PrecompiledHeaders/bnetPCH.h)
   set(PRIVATE_PCH_SOURCE PrecompiledHeaders/bnetPCH.cpp)
+  if (MSVC)
+    list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/bnetPCH.cpp)
+  endif (MSVC)
 endif()
 
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 
 add_executable(bnetserver
-  ${PRIVATE_PCH_SOURCE}
   ${PRIVATE_SOURCES}
 )
 
diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt
index ce2d83b4593..0e8bd80c3b9 100644
--- a/src/server/database/CMakeLists.txt
+++ b/src/server/database/CMakeLists.txt
@@ -17,12 +17,14 @@ CollectSourceFiles(
 if (USE_COREPCH)
   set(PRIVATE_PCH_HEADER PrecompiledHeaders/databasePCH.h)
   set(PRIVATE_PCH_SOURCE PrecompiledHeaders/databasePCH.cpp)
+  if (MSVC)
+    list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/databasePCH.cpp)
+  endif (MSVC)
 endif()
 
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 
 add_library(database
-  ${PRIVATE_PCH_SOURCE}
   ${PRIVATE_SOURCES}
 )
 
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 39eabacc9cc..946cf96b312 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -17,6 +17,9 @@ CollectSourceFiles(
 if (USE_COREPCH)
   set(PRIVATE_PCH_HEADER PrecompiledHeaders/gamePCH.h)
   set(PRIVATE_PCH_SOURCE PrecompiledHeaders/gamePCH.cpp)
+  if (MSVC)
+    list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/gamePCH.cpp)
+  endif (MSVC)
 endif ()
 
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
@@ -43,7 +46,6 @@ target_link_libraries(game-interface
     Detour)
 
 add_library(game
-  ${PRIVATE_PCH_SOURCE}
   ${PRIVATE_SOURCES})
 
 target_include_directories(game
diff --git a/src/server/proto/CMakeLists.txt b/src/server/proto/CMakeLists.txt
index edb9b29bf2d..a0da94b35cb 100644
--- a/src/server/proto/CMakeLists.txt
+++ b/src/server/proto/CMakeLists.txt
@@ -25,6 +25,9 @@ CollectSourceFiles(
 if (USE_COREPCH)
   set(PRIVATE_PCH_HEADER PrecompiledHeaders/protoPCH.h)
   set(PRIVATE_PCH_SOURCE PrecompiledHeaders/protoPCH.cpp)
+  if (MSVC)
+    list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/protoPCH.cpp)
+  endif (MSVC)
 endif()
 
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
@@ -32,7 +35,6 @@ GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 add_definitions(-DTRINITY_API_EXPORT_PROTO)
 
 add_library(proto
-  ${PRIVATE_PCH_SOURCE}
   ${PRIVATE_SOURCES}
 )
 
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 021a53a2a5e..9380515196a 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -92,6 +92,9 @@ endforeach()
 if (USE_SCRIPTPCH)
   set(PRIVATE_PCH_HEADER ScriptPCH.h)
   set(PRIVATE_PCH_SOURCE ScriptPCH.cpp)
+  if (MSVC)
+    list(INSERT PRIVATE_SOURCES 0 ScriptPCH.cpp)
+  endif (MSVC)  
 endif ()
 
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
@@ -158,9 +161,11 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST})
     GetProjectNameOfScriptModule(${SCRIPT_MODULE} SCRIPT_MODULE_PROJECT_NAME)
     # Add the module name to DYNAMIC_SCRIPT_MODULES
     list(APPEND DYNAMIC_SCRIPT_MODULE_PROJECTS ${SCRIPT_MODULE_PROJECT_NAME})
+    if (USE_SCRIPTPCH)
+      list(INSERT SCRIPT_MODULE_PRIVATE_SOURCES 0 ScriptPCH.cpp)
+    endif (USE_SCRIPTPCH)
     # Create the script module project
     add_library(${SCRIPT_MODULE_PROJECT_NAME} SHARED
-      ${PRIVATE_PCH_SOURCE}
       ${SCRIPT_MODULE_PRIVATE_SOURCES}
       ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER})
     target_link_libraries(${SCRIPT_MODULE_PROJECT_NAME}
@@ -200,7 +205,6 @@ ConfigureScriptLoader("static" SCRIPT_MODULE_PRIVATE_SCRIPTLOADER OFF ${STATIC_S
 
 add_library(scripts STATIC
   ScriptLoader.h
-  ${PRIVATE_PCH_SOURCE}
   ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER}
   ${PRIVATE_SOURCES})
 
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 155437e2816..ad9ab568185 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -24,12 +24,14 @@ endif()
 if (USE_COREPCH)
   set(PRIVATE_PCH_HEADER PrecompiledHeaders/worldPCH.h)
   set(PRIVATE_PCH_SOURCE PrecompiledHeaders/worldPCH.cpp)
+  if (MSVC)
+    list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/worldPCH.cpp)
+  endif (MSVC)
 endif()
 
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 
 add_executable(worldserver
-  ${PRIVATE_PCH_SOURCE}
   ${PRIVATE_SOURCES}
 )