JavaScriptCore: WebKit on Windows should build optionally with an unv…

…ersioned ICU DLL

https://bugs.webkit.org/show_bug.cgi?id=42722
<rdar://problem/8211743> JavaScriptCore needs to link against unversioned ICU

Reviewed by Adam Roben.

Dynamically create a new header, ICUVersion.h, as part of build-generated-files.sh.
Header contains a preprocessor define (U_DISABLE_RENAMING) indicating to ICU whether the ICU API
should be namespaced with the current ICU version number. Proper value is determined
by checking for the presence of libicuuc.lib, the unversioned copy of ICU.

To get the proper value for U_DISABLE_RENAMING into all source files, we force
the include of ICUVersion.h (our generated header) via the compiler options.

Since the versioned and unversioned ICU have different filenames (libicuuc.lib vs icuuc.lib)
we copy the ICU lib to an intermediate location under obj with a common name. This
allows us to link properly with either without adding a new build configuration.

* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
Copy ICU libs into a common location with a common name.
Add additional library search path to pick up icu lib.
Change ICU library filename specified to linker.
Add forced include of ICUVersion.h.
* JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh: Generate ICUVersion.h
* JavaScriptCore.vcproj/WTF/WTFCommon.vsprops: Add forced include of ICUVersion.h.
* JavaScriptCore.vcproj/jsc/jscCommon.vsprops:
Copy ICU libs into a common location with a common name.
Add additional library search path to pick up icu lib.
Change ICU library filename specified to linker.
Add forced include of ICUVersion.h.
* JavaScriptCore.vcproj/testapi/testapiCommon.vsprops:
Copy ICU libs into a common location with a common name.
Add additional library search path to pick up icu lib.
Change ICU library filename specified to linker.
Add forced include of ICUVersion.h.

WebCore: WebKit on Windows should build optionally with an unversioned ICU DLL
https://bugs.webkit.org/show_bug.cgi?id=42722
<rdar://problem/8211767> WebKit needs to link against unversioned ICU

Reviewed by Adam Roben.

To get the proper value for U_DISABLE_RENAMING into all source files, we force
the include of ICUVersion.h (our generated header) via the compiler options.

* WebCore.vcproj/WebCore.vcproj:
Add forced include of ICUVersion.h.
* WebCore.vcproj/WebCoreCommon.vsprops: Add forced include of ICUVersion.h.

WebKit/win: WebKit on Windows should build optionally with an unversioned ICU DLL
https://bugs.webkit.org/show_bug.cgi?id=42722
<rdar://problem/8211767> WebKit needs to link against unversioned ICU

Reviewed by Adam Roben.

To get the proper value for U_DISABLE_RENAMING into all source files, we force
the include of ICUVersion.h (our generated header) via the compiler options.

* WebKit.vcproj/WebKit.vcproj: Add forced include of ICUVersion.h.

WebKit2: WebKit on Windows should build optionally with an unversioned ICU DLL
https://bugs.webkit.org/show_bug.cgi?id=42722
<rdar://problem/8211767> WebKit needs to link against unversioned ICU

Reviewed by Adam Roben.

To get the proper value for U_DISABLE_RENAMING into all source files, we force
the include of ICUVersion.h (our generated header) via the compiler options.

Since the versioned and unversioned ICU have different filenames (libicuuc.lib vs icuuc.lib)
we copy the ICU lib to an intermediate location under obj with a common name. This
allows us to link properly with either without adding a new build configuration.

* win/WebKit2Common.vsprops:
Copy ICU libs into a common location with a common name.
Add additional library search path to pick up icu lib.
Change ICU library filename specified to linker.
Add forced include of ICUVersion.h.



Canonical link: https://commits.webkit.org/54670@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63833 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog

@@ -1,3 +1,41 @@
+2010-07-20  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Adam Roben.
+
+        WebKit on Windows should build optionally with an unversioned ICU DLL
+        https://bugs.webkit.org/show_bug.cgi?id=42722
+        <rdar://problem/8211743> JavaScriptCore needs to link against unversioned ICU
+
+        Dynamically create a new header, ICUVersion.h, as part of build-generated-files.sh.
+        Header contains a preprocessor define (U_DISABLE_RENAMING) indicating to ICU whether the ICU API
+        should be namespaced with the current ICU version number. Proper value is determined
+        by checking for the presence of libicuuc.lib, the unversioned copy of ICU.
+
+        To get the proper value for U_DISABLE_RENAMING into all source files, we force
+        the include of ICUVersion.h (our generated header) via the compiler options.
+
+        Since the versioned and unversioned ICU have different filenames (libicuuc.lib vs icuuc.lib)
+        we copy the ICU lib to an intermediate location under obj with a common name. This
+        allows us to link properly with either without adding a new build configuration.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
+        Copy ICU libs into a common location with a common name.
+        Add additional library search path to pick up icu lib.
+        Change ICU library filename specified to linker.
+        Add forced include of ICUVersion.h.
+        * JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh: Generate ICUVersion.h
+        * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops: Add forced include of ICUVersion.h.
+        * JavaScriptCore.vcproj/jsc/jscCommon.vsprops:
+        Copy ICU libs into a common location with a common name.
+        Add additional library search path to pick up icu lib.
+        Change ICU library filename specified to linker.
+        Add forced include of ICUVersion.h.
+        * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops:
+        Copy ICU libs into a common location with a common name.
+        Add additional library search path to pick up icu lib.
+        Change ICU library filename specified to linker.
+        Add forced include of ICUVersion.h.
+
 2010-07-20  Steve Falkenburg  <sfalken@apple.com>
 
         Re-save vsprops files after no-op edits in Visual Studio

JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops

@@ -8,12 +8,13 @@
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../parser/;../../bytecompiler/;../../jit/;../../runtime/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitOutputDir)\include\private";"$(WebKitLibrariesDir)\include\pthreads""
 		PreprocessorDefinitions="__STD_C"
-		ForcedIncludeFiles=""
+		ForcedIncludeFiles="ICUVersion.h"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="gdi32.lib oleaut32.lib winmm.lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib WTF$(WebKitConfigSuffix).lib"
+		AdditionalDependencies="gdi32.lib oleaut32.lib winmm.lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib WTF$(WebKitConfigSuffix).lib"
 		OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"
+		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"
 		ModuleDefinitionFile="JavaScriptCore.def"
 	/>
 	<Tool
@@ -24,4 +25,8 @@
 		Name="VCPreBuildEventTool"
 		CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"
 	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+		CommandLine="mkdir 2&gt;NUL &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;cmd /c&#x0D;&#x0A;"
+	/>
 </VisualStudioPropertySheet>

JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh

@@ -10,6 +10,16 @@ then
     echo "#define QUARTZCORE_PRESENT $?" > "${QUARTZCOREPRESENT_H_PATH}"
 fi
 
+# Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
+UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKITLIBRARIESDIR}/lib/libicuuc.lib")
+ICUVERSION_H_PATH=$(cygpath -u "${WEBKITOUTPUTDIR}/include/private/ICUVersion.h")
+if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \)
+then
+    mkdir -p "$(dirname "${ICUVERSION_H_PATH}")"
+    test ! -f "${UNVERSIONED_ICU_LIB_PATH}"
+    echo "#define U_DISABLE_RENAMING $?" > "${ICUVERSION_H_PATH}"
+fi
+
 NUMCPUS=`../../../WebKitTools/Scripts/num-cpus`
 
 XSRCROOT="`pwd`/../.."

JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops

@@ -9,6 +9,7 @@
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../parser/;../../wtf/;../../wtf/unicode/;"$(WebKitOutputDir)\include\private";"$(WebKitLibrariesDir)\include";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""
 		PreprocessorDefinitions="__STD_C"
+		ForcedIncludeFiles="ICUVersion.h"
 	/>
 	<Tool
 		Name="VCLibrarianTool"

JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops

@@ -8,11 +8,13 @@
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\private";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../assembler/;../../API/;../../parser/;../../runtime/;../../VM/;../../bytecode/;../../interpreter/;../../wtf/;../../debugger/;../../bytecompiler/;../../profiler;../../jit/;"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\include""
 		PreprocessorDefinitions="__STD_C"
-		ForcedIncludeFiles=""
+		ForcedIncludeFiles="ICUVersion.h"
+		ForcedUsingFiles=""
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib user32.lib"
+		AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib user32.lib"
+		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"
 		SubSystem="1"
 	/>
 	<Tool
@@ -23,4 +25,8 @@
 		Name="VCPreBuildEventTool"
 		CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
 	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+		CommandLine="mkdir 2&gt;NUL &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;cmd /c&#x0D;&#x0A;"
+	/>
 </VisualStudioPropertySheet>

JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops

@@ -9,11 +9,12 @@
 		AdditionalIncludeDirectories=""$(ProjectDir)\..\..\API";"$(WebKitOutputDir)\include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitOutputDir)\include\private\JavaScriptCore";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\private";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private""
 		WarningLevel="4"
 		Detect64BitPortabilityProblems="true"
-		ForcedIncludeFiles=""
+		ForcedIncludeFiles="ICUVersion.h"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib"
+		AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib"
+		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"
 		SubSystem="1"
 	/>
 	<Tool
@@ -24,4 +25,8 @@
 		Name="VCPreBuildEventTool"
 		CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
 	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+		CommandLine="mkdir 2&gt;NUL &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;cmd /c&#x0D;&#x0A;"
+	/>
 </VisualStudioPropertySheet>

WebCore/ChangeLog

@@ -1,3 +1,18 @@
+2010-07-20  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Adam Roben.
+
+        WebKit on Windows should build optionally with an unversioned ICU DLL
+        https://bugs.webkit.org/show_bug.cgi?id=42722
+        <rdar://problem/8211767> WebKit needs to link against unversioned ICU
+
+        To get the proper value for U_DISABLE_RENAMING into all source files, we force
+        the include of ICUVersion.h (our generated header) via the compiler options.
+
+        * WebCore.vcproj/WebCore.vcproj:
+        Add forced include of ICUVersion.h.
+        * WebCore.vcproj/WebCoreCommon.vsprops: Add forced include of ICUVersion.h.
+
 2010-07-21  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Reviewed by Pavel Feldman.

WebCore/WebCore.vcproj/WebCore.vcproj

@@ -364,7 +364,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -374,7 +374,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -384,7 +384,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -394,7 +394,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -404,7 +404,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -414,7 +414,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 			</File>
@@ -20910,7 +20910,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -20920,7 +20920,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -20930,7 +20930,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -20940,7 +20940,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -20950,7 +20950,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -20960,7 +20960,7 @@
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 						DisableSpecificWarnings="4065;4273;4565;4701;4702"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 			</File>
@@ -23824,7 +23824,7 @@
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="0"
-							ForcedIncludeFiles="$(NOINHERIT)"
+							ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -23833,7 +23833,7 @@
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="0"
-							ForcedIncludeFiles="$(NOINHERIT)"
+							ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -23842,7 +23842,7 @@
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="0"
-							ForcedIncludeFiles="$(NOINHERIT)"
+							ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -23851,7 +23851,7 @@
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="0"
-							ForcedIncludeFiles="$(NOINHERIT)"
+							ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -23860,7 +23860,7 @@
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="0"
-							ForcedIncludeFiles="$(NOINHERIT)"
+							ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -23869,7 +23869,7 @@
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="0"
-							ForcedIncludeFiles="$(NOINHERIT)"
+							ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 						/>
 					</FileConfiguration>
 				</File>
@@ -32067,7 +32067,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -32076,7 +32076,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -32085,7 +32085,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -32094,7 +32094,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -32103,7 +32103,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -32112,7 +32112,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
-						ForcedIncludeFiles="$(NOINHERIT)"
+						ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h"
 					/>
 				</FileConfiguration>
 			</File>

WebCore/WebCore.vcproj/WebCoreCommon.vsprops

@@ -12,7 +12,7 @@
 		UsePrecompiledHeader="2"
 		PrecompiledHeaderThrough="WebCorePrefix.h"
 		ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb"
-		ForcedIncludeFiles="WebCorePrefix.h"
+		ForcedIncludeFiles="WebCorePrefix.h;ICUVersion.h"
 	/>
 	<Tool
 		Name="VCPostBuildEventTool"