Changeset 63833 in webkit
- Timestamp:
- Jul 21, 2010 9:39:59 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r63801 r63833 1 2010-07-20 Steve Falkenburg <sfalken@apple.com> 2 3 Reviewed by Adam Roben. 4 5 WebKit on Windows should build optionally with an unversioned ICU DLL 6 https://bugs.webkit.org/show_bug.cgi?id=42722 7 <rdar://problem/8211743> JavaScriptCore needs to link against unversioned ICU 8 9 Dynamically create a new header, ICUVersion.h, as part of build-generated-files.sh. 10 Header contains a preprocessor define (U_DISABLE_RENAMING) indicating to ICU whether the ICU API 11 should be namespaced with the current ICU version number. Proper value is determined 12 by checking for the presence of libicuuc.lib, the unversioned copy of ICU. 13 14 To get the proper value for U_DISABLE_RENAMING into all source files, we force 15 the include of ICUVersion.h (our generated header) via the compiler options. 16 17 Since the versioned and unversioned ICU have different filenames (libicuuc.lib vs icuuc.lib) 18 we copy the ICU lib to an intermediate location under obj with a common name. This 19 allows us to link properly with either without adding a new build configuration. 20 21 * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: 22 Copy ICU libs into a common location with a common name. 23 Add additional library search path to pick up icu lib. 24 Change ICU library filename specified to linker. 25 Add forced include of ICUVersion.h. 26 * JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh: Generate ICUVersion.h 27 * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops: Add forced include of ICUVersion.h. 28 * JavaScriptCore.vcproj/jsc/jscCommon.vsprops: 29 Copy ICU libs into a common location with a common name. 30 Add additional library search path to pick up icu lib. 31 Change ICU library filename specified to linker. 32 Add forced include of ICUVersion.h. 33 * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops: 34 Copy ICU libs into a common location with a common name. 35 Add additional library search path to pick up icu lib. 36 Change ICU library filename specified to linker. 37 Add forced include of ICUVersion.h. 38 1 39 2010-07-20 Steve Falkenburg <sfalken@apple.com> 2 40 -
trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
r63801 r63833 9 9 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"" 10 10 PreprocessorDefinitions="__STD_C" 11 ForcedIncludeFiles=" "11 ForcedIncludeFiles="ICUVersion.h" 12 12 /> 13 13 <Tool 14 14 Name="VCLinkerTool" 15 AdditionalDependencies="gdi32.lib oleaut32.lib winmm.lib icuin$(LibraryConfigSuffix).libicuuc$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib WTF$(WebKitConfigSuffix).lib"15 AdditionalDependencies="gdi32.lib oleaut32.lib winmm.lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib WTF$(WebKitConfigSuffix).lib" 16 16 OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll" 17 AdditionalLibraryDirectories=""$(IntDir)\lib"" 17 18 ModuleDefinitionFile="JavaScriptCore.def" 18 19 /> … … 25 26 CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

bash "$(WebKitLibrariesDir)\tools\scripts\auto-version.sh" "$(IntDir)"
" 26 27 /> 28 <Tool 29 Name="VCPreLinkEventTool" 30 CommandLine="mkdir 2>NUL "$(IntDir)\lib"

if exist "$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib" "$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib"
if exist "$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib" "$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib"

if exist "$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib" "$(IntDir)\lib"
if exist "$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib" "$(IntDir)\lib"

cmd /c
" 31 /> 27 32 </VisualStudioPropertySheet> -
trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh
r52015 r63833 9 9 test ! -f "${QUARTZCORE_H_PATH}" 10 10 echo "#define QUARTZCORE_PRESENT $?" > "${QUARTZCOREPRESENT_H_PATH}" 11 fi 12 13 # Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4 14 UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKITLIBRARIESDIR}/lib/libicuuc.lib") 15 ICUVERSION_H_PATH=$(cygpath -u "${WEBKITOUTPUTDIR}/include/private/ICUVersion.h") 16 if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \) 17 then 18 mkdir -p "$(dirname "${ICUVERSION_H_PATH}")" 19 test ! -f "${UNVERSIONED_ICU_LIB_PATH}" 20 echo "#define U_DISABLE_RENAMING $?" > "${ICUVERSION_H_PATH}" 11 21 fi 12 22 -
trunk/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops
r53864 r63833 10 10 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"" 11 11 PreprocessorDefinitions="__STD_C" 12 ForcedIncludeFiles="ICUVersion.h" 12 13 /> 13 14 <Tool -
trunk/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops
r63801 r63833 9 9 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"" 10 10 PreprocessorDefinitions="__STD_C" 11 ForcedIncludeFiles="" 11 ForcedIncludeFiles="ICUVersion.h" 12 ForcedUsingFiles="" 12 13 /> 13 14 <Tool 14 15 Name="VCLinkerTool" 15 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib user32.lib" 16 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib user32.lib" 17 AdditionalLibraryDirectories=""$(IntDir)\lib"" 16 18 SubSystem="1" 17 19 /> … … 24 26 CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"
" 25 27 /> 28 <Tool 29 Name="VCPreLinkEventTool" 30 CommandLine="mkdir 2>NUL "$(IntDir)\lib"

if exist "$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib" "$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib"
if exist "$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib" "$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib"

if exist "$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib" "$(IntDir)\lib"
if exist "$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib" "$(IntDir)\lib"

cmd /c
" 31 /> 26 32 </VisualStudioPropertySheet> -
trunk/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops
r63801 r63833 10 10 WarningLevel="4" 11 11 Detect64BitPortabilityProblems="true" 12 ForcedIncludeFiles=" "12 ForcedIncludeFiles="ICUVersion.h" 13 13 /> 14 14 <Tool 15 15 Name="VCLinkerTool" 16 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib" 16 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib" 17 AdditionalLibraryDirectories=""$(IntDir)\lib"" 17 18 SubSystem="1" 18 19 /> … … 25 26 CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"
" 26 27 /> 28 <Tool 29 Name="VCPreLinkEventTool" 30 CommandLine="mkdir 2>NUL "$(IntDir)\lib"

if exist "$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib" "$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib"
if exist "$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib" "$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib"

if exist "$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib" "$(IntDir)\lib"
if exist "$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib" "$(IntDir)\lib"

cmd /c
" 31 /> 27 32 </VisualStudioPropertySheet> -
trunk/WebCore/ChangeLog
r63822 r63833 1 2010-07-20 Steve Falkenburg <sfalken@apple.com> 2 3 Reviewed by Adam Roben. 4 5 WebKit on Windows should build optionally with an unversioned ICU DLL 6 https://bugs.webkit.org/show_bug.cgi?id=42722 7 <rdar://problem/8211767> WebKit needs to link against unversioned ICU 8 9 To get the proper value for U_DISABLE_RENAMING into all source files, we force 10 the include of ICUVersion.h (our generated header) via the compiler options. 11 12 * WebCore.vcproj/WebCore.vcproj: 13 Add forced include of ICUVersion.h. 14 * WebCore.vcproj/WebCoreCommon.vsprops: Add forced include of ICUVersion.h. 15 1 16 2010-07-21 Ilya Tikhonovsky <loislo@chromium.org> 2 17 -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r63800 r63833 365 365 UsePrecompiledHeader="0" 366 366 DisableSpecificWarnings="4065;4273;4565;4701;4702" 367 ForcedIncludeFiles="$(NOINHERIT) "367 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 368 368 /> 369 369 </FileConfiguration> … … 375 375 UsePrecompiledHeader="0" 376 376 DisableSpecificWarnings="4065;4273;4565;4701;4702" 377 ForcedIncludeFiles="$(NOINHERIT) "377 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 378 378 /> 379 379 </FileConfiguration> … … 385 385 UsePrecompiledHeader="0" 386 386 DisableSpecificWarnings="4065;4273;4565;4701;4702" 387 ForcedIncludeFiles="$(NOINHERIT) "387 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 388 388 /> 389 389 </FileConfiguration> … … 395 395 UsePrecompiledHeader="0" 396 396 DisableSpecificWarnings="4065;4273;4565;4701;4702" 397 ForcedIncludeFiles="$(NOINHERIT) "397 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 398 398 /> 399 399 </FileConfiguration> … … 405 405 UsePrecompiledHeader="0" 406 406 DisableSpecificWarnings="4065;4273;4565;4701;4702" 407 ForcedIncludeFiles="$(NOINHERIT) "407 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 408 408 /> 409 409 </FileConfiguration> … … 415 415 UsePrecompiledHeader="0" 416 416 DisableSpecificWarnings="4065;4273;4565;4701;4702" 417 ForcedIncludeFiles="$(NOINHERIT) "417 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 418 418 /> 419 419 </FileConfiguration> … … 20911 20911 UsePrecompiledHeader="0" 20912 20912 DisableSpecificWarnings="4065;4273;4565;4701;4702" 20913 ForcedIncludeFiles="$(NOINHERIT) "20913 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 20914 20914 /> 20915 20915 </FileConfiguration> … … 20921 20921 UsePrecompiledHeader="0" 20922 20922 DisableSpecificWarnings="4065;4273;4565;4701;4702" 20923 ForcedIncludeFiles="$(NOINHERIT) "20923 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 20924 20924 /> 20925 20925 </FileConfiguration> … … 20931 20931 UsePrecompiledHeader="0" 20932 20932 DisableSpecificWarnings="4065;4273;4565;4701;4702" 20933 ForcedIncludeFiles="$(NOINHERIT) "20933 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 20934 20934 /> 20935 20935 </FileConfiguration> … … 20941 20941 UsePrecompiledHeader="0" 20942 20942 DisableSpecificWarnings="4065;4273;4565;4701;4702" 20943 ForcedIncludeFiles="$(NOINHERIT) "20943 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 20944 20944 /> 20945 20945 </FileConfiguration> … … 20951 20951 UsePrecompiledHeader="0" 20952 20952 DisableSpecificWarnings="4065;4273;4565;4701;4702" 20953 ForcedIncludeFiles="$(NOINHERIT) "20953 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 20954 20954 /> 20955 20955 </FileConfiguration> … … 20961 20961 UsePrecompiledHeader="0" 20962 20962 DisableSpecificWarnings="4065;4273;4565;4701;4702" 20963 ForcedIncludeFiles="$(NOINHERIT) "20963 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 20964 20964 /> 20965 20965 </FileConfiguration> … … 23825 23825 Name="VCCLCompilerTool" 23826 23826 UsePrecompiledHeader="0" 23827 ForcedIncludeFiles="$(NOINHERIT) "23827 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 23828 23828 /> 23829 23829 </FileConfiguration> … … 23834 23834 Name="VCCLCompilerTool" 23835 23835 UsePrecompiledHeader="0" 23836 ForcedIncludeFiles="$(NOINHERIT) "23836 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 23837 23837 /> 23838 23838 </FileConfiguration> … … 23843 23843 Name="VCCLCompilerTool" 23844 23844 UsePrecompiledHeader="0" 23845 ForcedIncludeFiles="$(NOINHERIT) "23845 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 23846 23846 /> 23847 23847 </FileConfiguration> … … 23852 23852 Name="VCCLCompilerTool" 23853 23853 UsePrecompiledHeader="0" 23854 ForcedIncludeFiles="$(NOINHERIT) "23854 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 23855 23855 /> 23856 23856 </FileConfiguration> … … 23861 23861 Name="VCCLCompilerTool" 23862 23862 UsePrecompiledHeader="0" 23863 ForcedIncludeFiles="$(NOINHERIT) "23863 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 23864 23864 /> 23865 23865 </FileConfiguration> … … 23870 23870 Name="VCCLCompilerTool" 23871 23871 UsePrecompiledHeader="0" 23872 ForcedIncludeFiles="$(NOINHERIT) "23872 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 23873 23873 /> 23874 23874 </FileConfiguration> … … 32068 32068 Name="VCCLCompilerTool" 32069 32069 UsePrecompiledHeader="0" 32070 ForcedIncludeFiles="$(NOINHERIT) "32070 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 32071 32071 /> 32072 32072 </FileConfiguration> … … 32077 32077 Name="VCCLCompilerTool" 32078 32078 UsePrecompiledHeader="0" 32079 ForcedIncludeFiles="$(NOINHERIT) "32079 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 32080 32080 /> 32081 32081 </FileConfiguration> … … 32086 32086 Name="VCCLCompilerTool" 32087 32087 UsePrecompiledHeader="0" 32088 ForcedIncludeFiles="$(NOINHERIT) "32088 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 32089 32089 /> 32090 32090 </FileConfiguration> … … 32095 32095 Name="VCCLCompilerTool" 32096 32096 UsePrecompiledHeader="0" 32097 ForcedIncludeFiles="$(NOINHERIT) "32097 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 32098 32098 /> 32099 32099 </FileConfiguration> … … 32104 32104 Name="VCCLCompilerTool" 32105 32105 UsePrecompiledHeader="0" 32106 ForcedIncludeFiles="$(NOINHERIT) "32106 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 32107 32107 /> 32108 32108 </FileConfiguration> … … 32113 32113 Name="VCCLCompilerTool" 32114 32114 UsePrecompiledHeader="0" 32115 ForcedIncludeFiles="$(NOINHERIT) "32115 ForcedIncludeFiles="$(NOINHERIT);ICUVersion.h" 32116 32116 /> 32117 32117 </FileConfiguration> -
trunk/WebCore/WebCore.vcproj/WebCoreCommon.vsprops
r63810 r63833 13 13 PrecompiledHeaderThrough="WebCorePrefix.h" 14 14 ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb" 15 ForcedIncludeFiles="WebCorePrefix.h "15 ForcedIncludeFiles="WebCorePrefix.h;ICUVersion.h" 16 16 /> 17 17 <Tool -
trunk/WebKit/win/ChangeLog
r63829 r63833 1 2010-07-20 Steve Falkenburg <sfalken@apple.com> 2 3 Reviewed by Adam Roben. 4 5 WebKit on Windows should build optionally with an unversioned ICU DLL 6 https://bugs.webkit.org/show_bug.cgi?id=42722 7 <rdar://problem/8211767> WebKit needs to link against unversioned ICU 8 9 To get the proper value for U_DISABLE_RENAMING into all source files, we force 10 the include of ICUVersion.h (our generated header) via the compiler options. 11 12 * WebKit.vcproj/WebKit.vcproj: Add forced include of ICUVersion.h. 13 1 14 2010-07-21 Adam Roben <aroben@apple.com> 2 15 -
trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj
r63151 r63833 47 47 ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb" 48 48 DisableSpecificWarnings="4819" 49 ForcedIncludeFiles="WebKitPrefix.h "49 ForcedIncludeFiles="WebKitPrefix.h;ICUVersion.h" 50 50 /> 51 51 <Tool … … 112 112 ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb" 113 113 DisableSpecificWarnings="4819" 114 ForcedIncludeFiles="WebKitPrefix.h "114 ForcedIncludeFiles="WebKitPrefix.h;ICUVersion.h" 115 115 /> 116 116 <Tool … … 177 177 Detect64BitPortabilityProblems="false" 178 178 DisableSpecificWarnings="4819" 179 ForcedIncludeFiles="WebKitPrefix.h "179 ForcedIncludeFiles="WebKitPrefix.h;ICUVersion.h" 180 180 /> 181 181 <Tool … … 241 241 ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb" 242 242 DisableSpecificWarnings="4819" 243 ForcedIncludeFiles="WebKitPrefix.h "243 ForcedIncludeFiles="WebKitPrefix.h;ICUVersion.h" 244 244 /> 245 245 <Tool … … 307 307 ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb" 308 308 DisableSpecificWarnings="4819" 309 ForcedIncludeFiles="WebKitPrefix.h "309 ForcedIncludeFiles="WebKitPrefix.h;ICUVersion.h" 310 310 /> 311 311 <Tool … … 372 372 Detect64BitPortabilityProblems="false" 373 373 DisableSpecificWarnings="4819" 374 ForcedIncludeFiles="WebKitPrefix.h "374 ForcedIncludeFiles="WebKitPrefix.h;ICUVersion.h" 375 375 /> 376 376 <Tool -
trunk/WebKit2/ChangeLog
r63832 r63833 1 2010-07-20 Steve Falkenburg <sfalken@apple.com> 2 3 Reviewed by Adam Roben. 4 5 WebKit on Windows should build optionally with an unversioned ICU DLL 6 https://bugs.webkit.org/show_bug.cgi?id=42722 7 <rdar://problem/8211767> WebKit needs to link against unversioned ICU 8 9 To get the proper value for U_DISABLE_RENAMING into all source files, we force 10 the include of ICUVersion.h (our generated header) via the compiler options. 11 12 Since the versioned and unversioned ICU have different filenames (libicuuc.lib vs icuuc.lib) 13 we copy the ICU lib to an intermediate location under obj with a common name. This 14 allows us to link properly with either without adding a new build configuration. 15 16 * win/WebKit2Common.vsprops: 17 Copy ICU libs into a common location with a common name. 18 Add additional library search path to pick up icu lib. 19 Change ICU library filename specified to linker. 20 Add forced include of ICUVersion.h. 21 1 22 2010-07-21 Adam Roben <aroben@apple.com> 2 23 -
trunk/WebKit2/win/WebKit2Common.vsprops
r63438 r63833 12 12 PrecompiledHeaderThrough="WebKit2Prefix.h" 13 13 DisableSpecificWarnings="4819" 14 ForcedIncludeFiles="WebKit2Prefix.h "14 ForcedIncludeFiles="WebKit2Prefix.h;ICUVersion.h" 15 15 /> 16 16 <Tool 17 17 Name="VCLinkerTool" 18 AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).libicuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitLib$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib comsuppw.lib rpcrt4.lib"18 AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitLib$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib comsuppw.lib rpcrt4.lib" 19 19 OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll" 20 AdditionalLibraryDirectories=""$(IntDir)\lib"" 20 21 DelayLoadDLLs="usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;iphlpapi.dll" 21 22 /> … … 29 30 /> 30 31 <Tool 32 Name="VCPreLinkEventTool" 33 CommandLine="mkdir 2>NUL "$(IntDir)\lib"

if exist "$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib" "$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib"
if exist "$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib" "$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib"

if exist "$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib" "$(IntDir)\lib"
if exist "$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib" copy /y "$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib" "$(IntDir)\lib"

cmd /c
" 34 /> 35 <Tool 31 36 Name="VCResourceCompilerTool" 32 37 AdditionalIncludeDirectories="$(WebKitOutputDir)\obj\WebKit2\"
Note: See TracChangeset
for help on using the changeset viewer.