diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake
index 351b3c4f4..5cebe1005 100644
--- a/code/CMakeModules/PCHSupport.cmake
+++ b/code/CMakeModules/PCHSupport.cmake
@@ -37,24 +37,21 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
-
 	STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
 	SET(${_out_compile_flags} ${${_flags_var_name}} )
 
 	IF(CMAKE_COMPILER_IS_GNUCXX)
-
 		GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
 		IF((${_targetType} STREQUAL SHARED_LIBRARY) OR (${_targetType} STREQUAL MODULE_LIBRARY))
 			LIST(APPEND ${_out_compile_flags} "-fPIC")
 		ENDIF((${_targetType} STREQUAL SHARED_LIBRARY) OR (${_targetType} STREQUAL MODULE_LIBRARY))
-
 	ELSE(CMAKE_COMPILER_IS_GNUCXX)
 		## TODO ... ? or does it work out of the box
 	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 	GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
 	FOREACH(item ${DIRINC})
-		LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}${item}")
+		LIST(APPEND ${_out_compile_flags} " ${_PCH_include_prefix}\"${item}\"")
 	ENDFOREACH(item)
 
 	GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
@@ -64,72 +61,83 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
 	LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS})
 
 	SEPARATE_ARGUMENTS(${_out_compile_flags})
-
 ENDMACRO(_PCH_GET_COMPILE_FLAGS)
 
-MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
+MACRO(_PCH_GET_PDB_FILENAME out_filename _target)
+	# determine output directory based on target type
+	GET_TARGET_PROPERTY(_targetType ${_target} TYPE)
+	IF(${_targetType} STREQUAL EXECUTABLE)
+		SET(_targetOutput ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+	ELSE(${_targetType} STREQUAL EXECUTABLE)
+		SET(_targetOutput ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+	ENDIF(${_targetType} STREQUAL EXECUTABLE)
+
+	# determine target postfix
+	STRING(TOUPPER "${CMAKE_BUILD_TYPE}_POSTFIX" _postfix_var_name)
+	GET_TARGET_PROPERTY(_targetPostfix ${_target} ${_postfix_var_name})
+	IF(${_targetPostfix} MATCHES NOTFOUND)
+		SET(_targetPostfix "")
+	ENDIF(${_targetPostfix} MATCHES NOTFOUND)
+
+	SET(${out_filename} "${_targetOutput}/${_target}${_targetPostfix}.pdb")
+ENDMACRO(_PCH_GET_PDB_FILENAME)
+
+MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _inputcpp _output)
+	IF(CMAKE_CXX_COMPILER_ARG1)
+		# remove leading space in compiler argument
+		STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1})
+	ELSE(CMAKE_CXX_COMPILER_ARG1)
+		SET(pchsupport_compiler_cxx_arg1 "")
+	ENDIF(CMAKE_CXX_COMPILER_ARG1)
 
 	IF(CMAKE_COMPILER_IS_GNUCXX)
-		IF(CMAKE_CXX_COMPILER_ARG1)
-			# remove leading space in compiler argument
-			STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1})
-
-			SET(${out_command}
-				${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	-x c++-header -o ${_output} -c ${_input}
-				)
-		ELSE(CMAKE_CXX_COMPILER_ARG1)
-			SET(${out_command}
-				${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} -c ${_input}
-				)
-		ENDIF(CMAKE_CXX_COMPILER_ARG1)
+		SET(${out_command}
+			${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	-x c++-header -o ${_output} -c ${_input}
+			)
 	ELSE(CMAKE_COMPILER_IS_GNUCXX)
-
-		# nothing to do because std*.cpp are already added to target
-
+		_PCH_GET_PDB_FILENAME(PDB_FILE ${_PCH_current_target})
+		SET(${out_command}
+			${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	/Yc  /Fp\"${_output}\" ${_inputcpp} /c /Fd\"${PDB_FILE}\"
+			)
 	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
 ENDMACRO(_PCH_GET_COMPILE_COMMAND )
 
+MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output)
+	IF(MSVC)
+		GET_FILENAME_COMPONENT(_name ${_input} NAME_WE)
+		SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.pch")
+	ELSE(MSVC)
+		GET_FILENAME_COMPONENT(_name ${_input} NAME)
+		SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch")
+	ENDIF(MSVC)
+ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input)
 
-
-MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags _header_name _pch_path)
-
-	FILE(TO_NATIVE_PATH ${_pch_path} _native_pch_path)
-
+MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
 	IF(CMAKE_COMPILER_IS_GNUCXX)
+		# to do: test whether compiler flags match between target  _targetName
+		# and _pch_output_to_use
+		GET_FILENAME_COMPONENT(_name ${_input} NAME)
+	
+		FILE(TO_NATIVE_PATH ${_pch_output_to_use} _native_pch_path)
+
 		# for use with distcc and gcc >4.0.1 if preprocessed files are accessible
 		# on all remote machines set
 		# PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess
-		SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS}-include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} -Winvalid-pch")
+		SET(_target_cflags "${PCH_ADDITIONAL_COMPILER_FLAGS} -include ${CMAKE_CURRENT_BINARY_DIR}/${_input} -Winvalid-pch")
+	ELSE(MSVCCMAKE_COMPILER_IS_GNUCXX)
+		IF(MSVC)
+			GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
+			IF(${oldProps} MATCHES NOTFOUND)
+				SET(oldProps "")
+			ENDIF(${oldProps} MATCHES NOTFOUND)
+
+			SET(_target_cflags "${oldProps} /Yu\"${_input}\" /FI\"${_input}\" /Fp\"${_pch_output_to_use}\"")
+		ENDIF(MSVC)
 	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-ENDMACRO(_PCH_GET_TARGET_COMPILE_FLAGS )
-
-MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output)
-	GET_FILENAME_COMPONENT(_name ${_input} NAME)
-	SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch")
-ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input)
-
-
-MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
-
-	# to do: test whether compiler flags match between target  _targetName
-	# and _pch_output_to_use
-	GET_FILENAME_COMPONENT(_name ${_input} NAME)
-
-	_PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use})
-
-	SET_TARGET_PROPERTIES(${_targetName}
-		PROPERTIES
-		COMPILE_FLAGS ${_target_cflags}
-	)
-
-	ADD_CUSTOM_TARGET(pch_Generate_${_targetName}
-		DEPENDS	${_pch_output_to_use}
-	)
-
-	ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName} )
-
+	SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS ${_target_cflags})
+	ADD_CUSTOM_TARGET(pch_Generate_${_targetName} DEPENDS ${_pch_output_to_use})
+	ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName})
 ENDMACRO(ADD_PRECOMPILED_HEADER_TO_TARGET)
 
 MACRO(ADD_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
@@ -154,7 +162,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
 
 	SET_SOURCE_FILES_PROPERTIES(${_inputh} PROPERTIES GENERATED 1)
 
-	_PCH_GET_COMPILE_COMMAND(_command  ${_inputh} ${_output})
+	_PCH_GET_COMPILE_COMMAND(_command  ${_inputh} ${_inputcpp} ${_output})
 
 	ADD_CUSTOM_COMMAND(
 		OUTPUT ${_output}
@@ -162,38 +170,34 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
 		DEPENDS ${_inputh} ${_targetName}_pch_dephelp
 	)
 
-	ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_inputh}  ${_output})
-
+	ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_inputh} ${_output})
 ENDMACRO(ADD_PRECOMPILED_HEADER)
 
 MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
-
-	if(CMAKE_GENERATOR MATCHES Visual*)
+	IF(CMAKE_GENERATOR MATCHES Visual*)
 		# Auto include the precompile (useful for moc processing, since the use of
 		# precompiled is specified at the target level
 		# and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt)
 
 		GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
-		if (${oldProps} MATCHES NOTFOUND)
+		IF(${oldProps} MATCHES NOTFOUND)
 			SET(oldProps "")
-		endif(${oldProps} MATCHES NOTFOUND)
+		ENDIF(${oldProps} MATCHES NOTFOUND)
 
 		SET(newProperties "${oldProps} /Yu\"${_inputh}\" /FI\"${_inputh}\"")
 		SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}")
 
 		#also inlude ${oldProps} to have the same compile options
 		SET_SOURCE_FILES_PROPERTIES(${_inputcpp} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_inputh}\"")
-
-	else(CMAKE_GENERATOR MATCHES Visual*)
-
-		if (CMAKE_GENERATOR MATCHES Xcode)
+	ELSE(CMAKE_GENERATOR MATCHES Visual*)
+		IF(CMAKE_GENERATOR MATCHES Xcode)
 			# For Xcode, cmake needs my patch to process
 			# GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
 
 			GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
-			if (${oldProps} MATCHES NOTFOUND)
+			IF(${oldProps} MATCHES NOTFOUND)
 				SET(oldProps "")
-			endif(${oldProps} MATCHES NOTFOUND)
+			ENDIF(${oldProps} MATCHES NOTFOUND)
 
 			# When buiding out of the tree, precompiled may not be located
 			# Use full path instead.
@@ -201,12 +205,10 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
 
 			SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
 			SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
-
-		else (CMAKE_GENERATOR MATCHES Xcode)
-
+		ELSE(CMAKE_GENERATOR MATCHES Xcode)
 			#Fallback to the "old" precompiled suppport
 			ADD_PRECOMPILED_HEADER(${_targetName} ${_inputh} ${_inputcpp})
-		endif(CMAKE_GENERATOR MATCHES Xcode)
-	endif(CMAKE_GENERATOR MATCHES Visual*)
+		ENDIF(CMAKE_GENERATOR MATCHES Xcode)
+	ENDIF(CMAKE_GENERATOR MATCHES Visual*)
 
 ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER)