Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (149066 => 149067)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,3 +1,16 @@
+2013-04-24 Roger Fong <[email protected]>
+
+ Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+ * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd:
+ * _javascript_Core.vcxproj/_javascript_CorePreLink.cmd:
+ * _javascript_Core.vcxproj/jsc/jscPostBuild.cmd:
+ * _javascript_Core.vcxproj/jsc/jscPreLink.cmd:
+ * _javascript_Core.vcxproj/testRegExp/testRegExp.vcxproj.filters:
+ * _javascript_Core.vcxproj/testRegExp/testRegExpPostBuild.cmd:
+ * _javascript_Core.vcxproj/testRegExp/testRegExpPreLink.cmd:
+ * _javascript_Core.vcxproj/testapi/testapiPreLink.cmd:
+
2013-04-24 Geoffrey Garen <[email protected]>
32-bit build fix.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd (149066 => 149067)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,9 +1,9 @@
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj\_javascript_CoreExportGenerator
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%\_javascript_CoreExports.def)
if exist "%OUTDIR%\_javascript_CoreExportGenerator%DEBUGSUFFIX%.exe" "%OUTDIR%\_javascript_CoreExportGenerator%DEBUGSUFFIX%.exe" > "%GeneratorDirectory%\_javascript_CoreExports.def"
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CorePreLink.cmd (149066 => 149067)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CorePreLink.cmd 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CorePreLink.cmd 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,9 +1,9 @@
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
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscPostBuild.cmd (149066 => 149067)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscPostBuild.cmd 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscPostBuild.cmd 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,25 +1,25 @@
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
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscPreLink.cmd (149066 => 149067)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscPreLink.cmd 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscPreLink.cmd 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,9 +1,9 @@
-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
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExp.vcxproj.filters (149066 => 149067)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExp.vcxproj.filters 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExp.vcxproj.filters 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\AtomicString.cpp">
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp" />
+ <ClCompile Include="..\..\testRegExp.cpp">
<Filter>wtf/text</Filter>
</ClCompile>
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringBuilder.cpp">
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp">
<Filter>wtf/text</Filter>
</ClCompile>
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringImpl.cpp">
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp">
<Filter>wtf/text</Filter>
</ClCompile>
- <ClCompile Include="..\..\testRegExp.cpp" />
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\WTFString.cpp">
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp">
<Filter>wtf/text</Filter>
</ClCompile>
</ItemGroup>
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpPostBuild.cmd (149066 => 149067)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpPostBuild.cmd 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpPostBuild.cmd 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,25 +1,25 @@
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
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpPreLink.cmd (149066 => 149067)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpPreLink.cmd 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpPreLink.cmd 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,9 +1,9 @@
-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
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiPreLink.cmd (149066 => 149067)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiPreLink.cmd 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiPreLink.cmd 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,9 +1,9 @@
-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
Modified: trunk/Source/WTF/ChangeLog (149066 => 149067)
--- trunk/Source/WTF/ChangeLog 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/WTF/ChangeLog 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,3 +1,9 @@
+2013-04-24 Roger Fong <[email protected]>
+
+ Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+ * WTF.vcxproj/build-generated-files.sh:
+
2013-04-24 Benjamin Poulain <[email protected]>
Use post-branch store for RefCountedBase::derefBase
Modified: trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh (149066 => 149067)
--- trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,7 +1,7 @@
#!/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
Modified: trunk/WebKitLibraries/ChangeLog (149066 => 149067)
--- trunk/WebKitLibraries/ChangeLog 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/WebKitLibraries/ChangeLog 2013-04-24 21:43:53 UTC (rev 149067)
@@ -1,3 +1,9 @@
+2013-04-24 Roger Fong <[email protected]>
+
+ Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+ * win/tools/vsprops/common.props:
+
2013-04-23 Antoine Quint <[email protected]>
Initial advance of text runs should be taken into account
Modified: trunk/WebKitLibraries/win/tools/vsprops/common.props (149066 => 149067)
--- trunk/WebKitLibraries/win/tools/vsprops/common.props 2013-04-24 21:37:34 UTC (rev 149066)
+++ trunk/WebKitLibraries/win/tools/vsprops/common.props 2013-04-24 21:43:53 UTC (rev 149067)
@@ -173,7 +173,7 @@
</ResourceCompile>
<BuildLog />
<Link>
- <AdditionalLibraryDirectories>$(IntDir)lib;$(ConfigurationBuildDir)\lib;$(WEBKIT_LIBRARIES)\lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(IntDir)lib;$(ConfigurationBuildDir)\lib;$(WEBKIT_LIBRARIES)\lib32;$(WEBKIT_LIBRARIES)\lib</AdditionalLibraryDirectories>
<LinkErrorReporting>PromptImmediately</LinkErrorReporting>
<CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
