+2013-04-24 Roger Fong <roger_fong@apple.com>
+
+ Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+ * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd:
+ * JavaScriptCore.vcxproj/JavaScriptCorePreLink.cmd:
+ * JavaScriptCore.vcxproj/jsc/jscPostBuild.cmd:
+ * JavaScriptCore.vcxproj/jsc/jscPreLink.cmd:
+ * JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj.filters:
+ * JavaScriptCore.vcxproj/testRegExp/testRegExpPostBuild.cmd:
+ * JavaScriptCore.vcxproj/testRegExp/testRegExpPreLink.cmd:
+ * JavaScriptCore.vcxproj/testapi/testapiPreLink.cmd:
+
2013-04-24 Geoffrey Garen <ggaren@apple.com>
32-bit build fix.
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj\JavaScriptCoreExportGenerator
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin32\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
echo Exporting link definition output (%GeneratorDirectory%\JavaScriptCoreExports.def)
if exist "%OUTDIR%\JavaScriptCoreExportGenerator%DEBUGSUFFIX%.exe" "%OUTDIR%\JavaScriptCoreExportGenerator%DEBUGSUFFIX%.exe" > "%GeneratorDirectory%\JavaScriptCoreExports.def"
mkdir 2>NUL "%IntDir%\lib"
-if exist "%WebKit_Libraries%\lib\icuuc.lib" copy /y "%WebKit_Libraries%\lib\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
-if exist "%WebKit_Libraries%\lib\icuin.lib" copy /y "%WebKit_Libraries%\lib\icuin.lib" "%IntDir%\lib\libicuin.lib"
+if exist "%WebKit_Libraries%\lib32\icuuc.lib" copy /y "%WebKit_Libraries%\lib32\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
+if exist "%WebKit_Libraries%\lib32\icuin.lib" copy /y "%WebKit_Libraries%\lib32\icuin.lib" "%IntDir%\lib\libicuin.lib"
-if exist "%WebKit_Libraries%\lib\libicuuc.lib" copy /y "%WebKit_Libraries%\lib\libicuuc.lib" "%IntDir%\lib"
-if exist "%WebKit_Libraries%\lib\libicuin.lib" copy /y "%WebKit_Libraries%\lib\libicuin.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuuc.lib" copy /y "%WebKit_Libraries%\lib32\libicuuc.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuin.lib" copy /y "%WebKit_Libraries%\lib32\libicuin.lib" "%IntDir%\lib"
cmd /c
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuin.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuin.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuin40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuin40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuuc40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuuc40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuin42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuin42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuuc42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuuc42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\CoreFoundation.dll" xcopy /y /d "%WebKit_Libraries%\bin\CoreFoundation.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\CoreFoundation.resources" xcopy /y /d /e /i "%WebKit_Libraries%\bin\CoreFoundation.resources" "%CONFIGURATIONBUILDDIR%\bin\CoreFoundation.resources"
-if exist "%WebKit_Libraries%\bin\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\objc.dll" xcopy /y /d "%WebKit_Libraries%\bin\objc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\ASL.dll" xcopy /y /d "%WebKit_Libraries%\bin\ASL.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libdispatch.dll" xcopy /y /d "%WebKit_Libraries%\bin\libdispatch.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuin.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuin.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuin40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuin40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuuc40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuuc40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuin42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuin42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuuc42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuuc42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\CoreFoundation.dll" xcopy /y /d "%WebKit_Libraries%\bin32\CoreFoundation.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\CoreFoundation.resources" xcopy /y /d /e /i "%WebKit_Libraries%\bin32\CoreFoundation.resources" "%CONFIGURATIONBUILDDIR%\bin\CoreFoundation.resources"
+if exist "%WebKit_Libraries%\bin32\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin32\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\objc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\objc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\ASL.dll" xcopy /y /d "%WebKit_Libraries%\bin32\ASL.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libdispatch.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libdispatch.dll" "%CONFIGURATIONBUILDDIR%\bin"
cmd /c
-mkdir 2>NUL "%INTDIR%\lib"
+mkdir 2>NUL "%IntDir%\lib"
-if exist "%WebKit_Libraries%\lib\icuuc.lib" copy /y "%WebKit_Libraries%\lib\icuuc.lib" "%INTDIR%\lib\libicuuc.lib"
-if exist "%WebKit_Libraries%\lib\icuin.lib" copy /y "%WebKit_Libraries%\lib\icuin.lib" "%INTDIR%\lib\libicuin.lib"
+if exist "%WebKit_Libraries%\lib32\icuuc.lib" copy /y "%WebKit_Libraries%\lib32\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
+if exist "%WebKit_Libraries%\lib32\icuin.lib" copy /y "%WebKit_Libraries%\lib32\icuin.lib" "%IntDir%\lib\libicuin.lib"
-if exist "%WebKit_Libraries%\lib\libicuuc.lib" copy /y "%WebKit_Libraries%\lib\libicuuc.lib" "%INTDIR%\lib"
-if exist "%WebKit_Libraries%\lib\libicuin.lib" copy /y "%WebKit_Libraries%\lib\libicuin.lib" "%INTDIR%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuuc.lib" copy /y "%WebKit_Libraries%\lib32\libicuuc.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuin.lib" copy /y "%WebKit_Libraries%\lib32\libicuin.lib" "%IntDir%\lib"
cmd /c
<?xml version="1.0" encoding="utf-8"?>\r
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
<ItemGroup>\r
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\AtomicString.cpp">\r
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp" />\r
+ <ClCompile Include="..\..\testRegExp.cpp">\r
<Filter>wtf/text</Filter>\r
</ClCompile>\r
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringBuilder.cpp">\r
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp">\r
<Filter>wtf/text</Filter>\r
</ClCompile>\r
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringImpl.cpp">\r
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp">\r
<Filter>wtf/text</Filter>\r
</ClCompile>\r
- <ClCompile Include="..\..\testRegExp.cpp" />\r
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\WTFString.cpp">\r
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp">\r
<Filter>wtf/text</Filter>\r
</ClCompile>\r
</ItemGroup>\r
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuin.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuin.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuin40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuin40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuuc40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuuc40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuin42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuin42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuuc42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuuc42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\CoreFoundation.dll" xcopy /y /d "%WebKit_Libraries%\bin\CoreFoundation.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\CoreFoundation.resources" xcopy /y /d /e /i "%WebKit_Libraries%\bin\CoreFoundation.resources" "%CONFIGURATIONBUILDDIR%\bin\CoreFoundation.resources"
-if exist "%WebKit_Libraries%\bin\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\objc.dll" xcopy /y /d "%WebKit_Libraries%\bin\objc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\ASL.dll" xcopy /y /d "%WebKit_Libraries%\bin\ASL.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libdispatch.dll" xcopy /y /d "%WebKit_Libraries%\bin\libdispatch.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuin.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuin.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuin40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuin40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuuc40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuuc40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuin42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuin42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuuc42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuuc42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\CoreFoundation.dll" xcopy /y /d "%WebKit_Libraries%\bin32\CoreFoundation.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\CoreFoundation.resources" xcopy /y /d /e /i "%WebKit_Libraries%\bin32\CoreFoundation.resources" "%CONFIGURATIONBUILDDIR%\bin\CoreFoundation.resources"
+if exist "%WebKit_Libraries%\bin32\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin32\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\objc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\objc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\ASL.dll" xcopy /y /d "%WebKit_Libraries%\bin32\ASL.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libdispatch.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libdispatch.dll" "%CONFIGURATIONBUILDDIR%\bin"
cmd /c
-mkdir 2>NUL "%INTDIR%\lib"
+mkdir 2>NUL "%IntDir%\lib"
-if exist "%WebKit_Libraries%\lib\icuuc.lib" copy /y "%WebKit_Libraries%\lib\icuuc.lib" "%INTDIR%\lib\libicuuc.lib"
-if exist "%WebKit_Libraries%\lib\icuin.lib" copy /y "%WebKit_Libraries%\lib\icuin.lib" "%INTDIR%\lib\libicuin.lib"
+if exist "%WebKit_Libraries%\lib32\icuuc.lib" copy /y "%WebKit_Libraries%\lib32\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
+if exist "%WebKit_Libraries%\lib32\icuin.lib" copy /y "%WebKit_Libraries%\lib32\icuin.lib" "%IntDir%\lib\libicuin.lib"
-if exist "%WebKit_Libraries%\lib\libicuuc.lib" copy /y "%WebKit_Libraries%\lib\libicuuc.lib" "%INTDIR%\lib"
-if exist "%WebKit_Libraries%\lib\libicuin.lib" copy /y "%WebKit_Libraries%\lib\libicuin.lib" "%INTDIR%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuuc.lib" copy /y "%WebKit_Libraries%\lib32\libicuuc.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuin.lib" copy /y "%WebKit_Libraries%\lib32\libicuin.lib" "%IntDir%\lib"
cmd /c
-mkdir 2>NUL "%INTDIR%\lib"
+mkdir 2>NUL "%IntDir%\lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\icuuc.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuuc.lib" "%INTDIR%\lib\libicuuc.lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\icuin.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuin.lib" "%INTDIR%\lib\libicuin.lib"
+if exist "%WebKit_Libraries%\lib32\icuuc.lib" copy /y "%WebKit_Libraries%\lib32\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
+if exist "%WebKit_Libraries%\lib32\icuin.lib" copy /y "%WebKit_Libraries%\lib32\icuin.lib" "%IntDir%\lib\libicuin.lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\libicuuc.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuuc.lib" "%INTDIR%\lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\libicuin.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuin.lib" "%INTDIR%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuuc.lib" copy /y "%WebKit_Libraries%\lib32\libicuuc.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuin.lib" copy /y "%WebKit_Libraries%\lib32\libicuin.lib" "%IntDir%\lib"
cmd /c
+2013-04-24 Roger Fong <roger_fong@apple.com>
+
+ Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+ * WTF.vcxproj/build-generated-files.sh:
+
2013-04-24 Benjamin Poulain <benjamin@webkit.org>
Use post-branch store for RefCountedBase::derefBase
#!/usr/bin/bash
# Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
-UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib/libicuuc.lib")
+UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib32/libicuuc.lib")
ICUVERSION_H_PATH=$(cygpath -u "${CONFIGURATIONBUILDDIR}/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
+2013-04-24 Roger Fong <roger_fong@apple.com>
+
+ Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+ * win/tools/vsprops/common.props:
+
2013-04-23 Antoine Quint <graouts@apple.com>
Initial advance of text runs should be taken into account
</ResourceCompile>\r
<BuildLog />\r
<Link>\r
- <AdditionalLibraryDirectories>$(IntDir)lib;$(ConfigurationBuildDir)\lib;$(WEBKIT_LIBRARIES)\lib</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>$(IntDir)lib;$(ConfigurationBuildDir)\lib;$(WEBKIT_LIBRARIES)\lib32;$(WEBKIT_LIBRARIES)\lib</AdditionalLibraryDirectories>\r
<LinkErrorReporting>PromptImmediately</LinkErrorReporting>\r
<CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>\r
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r