pch.patch

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index ee67f89..913162d 100644
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -1327,7 +1327,9 @@ WEBKIT_CREATE_FORWARDING_HEADERS(JavaScriptCore DIRECTORIES ${JavaScriptCore_FOR
 add_subdirectory(shell)
 
 WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
+#ADD_PRECOMPILED_HEADER(JavaScriptCorePrefix.h JavaScriptCorePrefix.cpp JavaScriptCore_SOURCES)
 WEBKIT_FRAMEWORK(JavaScriptCore)
+new_add_precompiled_header(JavaScriptCore JavaScriptCorePrefix.h FORCEINCLUDE) # SOURCE_C WTFPrefix.c SOURCE_CXX WTFPrefix.cpp)
 
 if (NOT APPLE)
     if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
diff --git a/Source/JavaScriptCore/JavaScriptCorePrefix.h b/Source/JavaScriptCore/JavaScriptCorePrefix.h
index 21d6204..55dcf08 100644
--- a/Source/JavaScriptCore/JavaScriptCorePrefix.h
+++ b/Source/JavaScriptCore/JavaScriptCorePrefix.h
@@ -1,8 +1,18 @@
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
+#include "cmakeconfig.h"
+#endif
+
+#include "config.h"
+
+#include <wtf/Platform.h>
+
+#if defined(__APPLE__)
 #ifdef __cplusplus
 #define NULL __null
 #else
 #define NULL ((void *)0)
 #endif
+#endif
 
 #include <ctype.h>
 #include <float.h>
diff --git a/Source/cmake/PrecompiledHeader.cmake b/Source/cmake/PrecompiledHeader.cmake
new file mode 100644
index 0000000..7f27fd7
--- /dev/null
+++ b/Source/cmake/PrecompiledHeader.cmake
@@ -0,0 +1,225 @@
+# Function for setting up precompiled headers. Usage:
+#
+#   add_library/executable(target
+#       pchheader.c pchheader.cpp pchheader.h)
+#
+#   add_precompiled_header(target pchheader.h
+#       [FORCEINCLUDE]
+#       [SOURCE_C pchheader.c]
+#       [SOURCE_CXX pchheader.cpp])
+#
+# Options:
+#
+#   FORCEINCLUDE: Add compiler flags to automatically include the
+#   pchheader.h from every source file. Works with both GCC and
+#   MSVC. This is recommended.
+#
+#   SOURCE_C/CXX: Specifies the .c/.cpp source file that includes
+#   pchheader.h for generating the pre-compiled header
+#   output. Defaults to pchheader.c. Only required for MSVC.
+#
+# Caveats:
+#
+#   * Its not currently possible to use the same precompiled-header in
+#     more than a single target in the same directory (No way to set
+#     the source file properties differently for each target).
+#
+#   * MSVC: A source file with the same name as the header must exist
+#     and be included in the target (E.g. header.cpp). Name of file
+#     can be changed using the SOURCE_CXX/SOURCE_C options.
+#
+# License:
+#
+# Copyright (C) 2009-2013 Lars Christensen <larsch@belunktum.dk>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the 'Software') deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+include(CMakeParseArguments)
+
+macro(combine_arguments _variable)
+  set(_result "")
+  foreach(_element ${${_variable}})
+    set(_result "${_result} \"${_element}\"")
+  endforeach()
+  string(STRIP "${_result}" _result)
+  set(${_variable} "${_result}")
+endmacro()
+
+function(export_all_flags _filename)
+  set(_include_directories "$<TARGET_PROPERTY:${_target},INCLUDE_DIRECTORIES>")
+  set(_compile_definitions "$<TARGET_PROPERTY:${_target},COMPILE_DEFINITIONS>")
+  set(_compile_flags "$<TARGET_PROPERTY:${_target},COMPILE_FLAGS>")
+  set(_compile_options "$<TARGET_PROPERTY:${_target},COMPILE_OPTIONS>")
+  set(_include_directories "$<$<BOOL:${_include_directories}>:-I$<JOIN:${_include_directories},\n-I>\n>")
+  set(_compile_definitions "$<$<BOOL:${_compile_definitions}>:-D$<JOIN:${_compile_definitions},\n-D>\n>")
+  set(_compile_flags "$<$<BOOL:${_compile_flags}>:$<JOIN:${_compile_flags},\n>\n>")
+  set(_compile_options "$<$<BOOL:${_compile_options}>:$<JOIN:${_compile_options},\n>\n>")
+  string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _compile_flags_var)
+  set(_compile_flags ${${_compile_flags_var}})
+  file(GENERATE OUTPUT "${_filename}" CONTENT "${_compile_definitions}${_include_directories}${_compile_flags}${_compile_options}${CMAKE_CXX_FLAGS}\n")
+  message(${_filename})
+endfunction()
+
+function(new_add_precompiled_header _target _input)
+  cmake_parse_arguments(_PCH "FORCEINCLUDE" "SOURCE_CXX:SOURCE_C" "" ${ARGN})
+
+  get_filename_component(_input_we ${_input} NAME_WE)
+  if(NOT _PCH_SOURCE_CXX)
+    set(_PCH_SOURCE_CXX "${_input_we}.cpp")
+  endif()
+  if(NOT _PCH_SOURCE_C)
+    set(_PCH_SOURCE_C "${_input_we}.c")
+  endif()
+
+  if(MSVC)
+
+    set(_cxx_path "${CMAKE_CURRENT_BINARY_DIR}/${_target}_cxx_pch")
+    set(_c_path "${CMAKE_CURRENT_BINARY_DIR}/${_target}_c_pch")
+    make_directory("${_cxx_path}")
+    make_directory("${_c_path}")
+    set(_pch_cxx_header "${_cxx_path}/${_input}")
+    set(_pch_cxx_pch "${_cxx_path}/${_input_we}.pch")
+    set(_pch_c_header "${_c_path}/${_input}")
+    set(_pch_c_pch "${_c_path}/${_input_we}.pch")
+
+    get_target_property(sources ${_target} SOURCES)
+    foreach(_source ${sources})
+      set(_pch_compile_flags "")
+      if(_source MATCHES \\.\(cc|cxx|cpp|c\)$)
+	if(_source MATCHES \\.\(cpp|cxx|cc\)$)
+	  set(_pch_header "${_input}")
+	  set(_pch "${_pch_cxx_pch}")
+	else()
+	  set(_pch_header "${_input}")
+	  set(_pch "${_pch_c_pch}")
+	endif()
+
+	if(_source STREQUAL "${_PCH_SOURCE_CXX}")
+	  set(_pch_compile_flags "${_pch_compile_flags} \"/Fp${_pch_cxx_pch}\" /Yc${_input}")
+	  set(_pch_source_cxx_found TRUE)
+	elseif(_source STREQUAL "${_PCH_SOURCE_C}")
+	  set(_pch_compile_flags "${_pch_compile_flags} \"/Fp${_pch_c_pch}\" /Yc${_input}")
+	  set(_pch_source_c_found TRUE)
+	else()
+	  if(_source MATCHES \\.\(cpp|cxx|cc\)$)
+	    set(_pch_compile_flags "${_pch_compile_flags} \"/Fp${_pch_cxx_pch}\" /Yu${_input}")
+	    set(_pch_source_cxx_needed TRUE)
+	  else()
+	    set(_pch_compile_flags "${_pch_compile_flags} \"/Fp${_pch_c_pch}\" /Yu${_input}")
+	    set(_pch_source_c_needed TRUE)
+	  endif()
+	  if(_PCH_FORCEINCLUDE)
+	    set(_pch_compile_flags "${_pch_compile_flags} /FI${_input}")
+	  endif(_PCH_FORCEINCLUDE)
+	endif()
+
+	get_source_file_property(_object_depends "${_source}" OBJECT_DEPENDS)
+	if(NOT _object_depends)
+	  set(_object_depends)
+	endif()
+	if(_PCH_FORCEINCLUDE)
+	  if(_source MATCHES \\.\(cc|cxx|cpp\)$)
+	    list(APPEND _object_depends "${_pch_header}")
+	  else()
+	    list(APPEND _object_depends "${_pch_header}")
+	  endif()
+	endif()
+
+	set_source_files_properties(${_source} PROPERTIES
+	  COMPILE_FLAGS "${_pch_compile_flags}"
+	  OBJECT_DEPENDS "${_object_depends}")
+      endif()
+    endforeach()
+
+    if(_pch_source_cxx_needed AND NOT _pch_source_cxx_found)
+      message(FATAL_ERROR "A source file ${_PCH_SOURCE_CXX} for ${_input} is required for MSVC builds. Can be set with the SOURCE_CXX option.")
+    endif()
+    if(_pch_source_c_needed AND NOT _pch_source_c_found)
+      message(FATAL_ERROR "A source file ${_PCH_SOURCE_C} for ${_input} is required for MSVC builds. Can be set with the SOURCE_C option.")
+    endif()
+  endif(MSVC)
+
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    get_filename_component(_name ${_input} NAME)
+    set(_pch_header "${CMAKE_CURRENT_SOURCE_DIR}/${_input}")
+    set(_pch_binary_dir "${CMAKE_CURRENT_BINARY_DIR}/${_target}_pch")
+    set(_pchfile "${_pch_binary_dir}/${_input}")
+    set(_outdir "${CMAKE_CURRENT_BINARY_DIR}/${_target}_pch/${_name}.gch")
+    make_directory(${_outdir})
+    set(_output_cxx "${_outdir}/.c++")
+    set(_output_c "${_outdir}/.c")
+
+    set(_pch_flags_file "${_pch_binary_dir}/compile_flags.rsp")
+    export_all_flags("${_pch_flags_file}")
+    set(_compiler_FLAGS "@${_pch_flags_file}")
+    add_custom_command(
+      OUTPUT "${_pchfile}"
+      COMMAND "${CMAKE_COMMAND}" -E copy "${_pch_header}" "${_pchfile}"
+      DEPENDS "${_pch_header}"
+      COMMENT "Updating ${_name}")
+    add_custom_command(
+      OUTPUT "${_output_cxx}"
+      COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output_cxx}" "${_pchfile}"
+      DEPENDS "${_pchfile}" "${_pch_flags_file}"
+      COMMENT "Precompiling ${_name} for ${_target} (C++)")
+    add_custom_command(
+      OUTPUT "${_output_c}"
+      COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} -x c-header -o "${_output_c}" "${_pchfile}"
+      DEPENDS "${_pchfile}" "${_pch_flags_file}"
+      COMMENT "Precompiling ${_name} for ${_target} (C)")
+
+    get_property(_sources TARGET ${_target} PROPERTY SOURCES)
+    foreach(_source ${_sources})
+      set(_pch_compile_flags "")
+
+      if(_source MATCHES \\.\(cc|cxx|cpp|c\)$)
+	get_source_file_property(_pch_compile_flags "${_source}" COMPILE_FLAGS)
+	if(NOT _pch_compile_flags)
+	  set(_pch_compile_flags)
+	endif()
+	separate_arguments(_pch_compile_flags)
+	list(APPEND _pch_compile_flags -Winvalid-pch)
+	if(_PCH_FORCEINCLUDE)
+	  list(APPEND _pch_compile_flags -include "${_pchfile}")
+	else(_PCH_FORCEINCLUDE)
+	  list(APPEND _pch_compile_flags "-I${_pch_binary_dir}")
+	endif(_PCH_FORCEINCLUDE)
+
+	get_source_file_property(_object_depends "${_source}" OBJECT_DEPENDS)
+	if(NOT _object_depends)
+	  set(_object_depends)
+	endif()
+	list(APPEND _object_depends "${_pchfile}")
+	if(_source MATCHES \\.\(cc|cxx|cpp\)$)
+	  list(APPEND _object_depends "${_output_cxx}")
+	else()
+	  list(APPEND _object_depends "${_output_c}")
+	endif()
+
+	combine_arguments(_pch_compile_flags)
+    #message("${_source}" ${_pch_compile_flags})
+	set_source_files_properties(${_source} PROPERTIES
+	  COMPILE_FLAGS "${_pch_compile_flags}"
+	  OBJECT_DEPENDS "${_object_depends}")
+      endif()
+    endforeach()
+  endif(CMAKE_COMPILER_IS_GNUCXX)
+endfunction()