Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (154353 => 154354)
--- trunk/Source/_javascript_Core/ChangeLog 2013-08-20 20:23:35 UTC (rev 154353)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-08-20 20:45:34 UTC (rev 154354)
@@ -1,3 +1,17 @@
+2013-08-20 Alex Christensen <[email protected]>
+
+ <https://webkit.org/b/120076> More work towards a Win64 build
+
+ Reviewed by Brent Fulgham.
+
+ * _javascript_Core.vcxproj/_javascript_CoreGenerated.make:
+ * _javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
+ * _javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
+ * _javascript_Core.vcxproj/copy-files.cmd:
+ * _javascript_Core.vcxproj/jsc/jscCommon.props:
+ * _javascript_Core.vcxproj/testRegExp/testRegExpCommon.props:
+ Use PlatformArchitecture macro instead of bin32, lib32, and obj32.
+
2013-08-20 Mark Hahnenberg <[email protected]>
<https://webkit.org/b/119919> Concurrent JIT crashes in various fast/js/dfg-* tests while the main thread is setting innerHTML
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make (154353 => 154354)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make 2013-08-20 20:23:35 UTC (rev 154353)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make 2013-08-20 20:45:34 UTC (rev 154354)
@@ -9,4 +9,4 @@
clean:
-del "%ConfigurationBuildDir%\buildfailed"
copy-files.cmd clean
- -del /s /q "%ConfigurationBuildDir%\obj32\_javascript_Core\DerivedSources"
+ -del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\_javascript_Core\DerivedSources"
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make (154353 => 154354)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make 2013-08-20 20:23:35 UTC (rev 154353)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make 2013-08-20 20:45:34 UTC (rev 154354)
@@ -5,4 +5,4 @@
clean:
-del "%ConfigurationBuildDir%\buildfailed"
- -del /s /q "%ConfigurationBuildDir%\obj32\_javascript_Core\DerivedSources\LLIntAssembly.h"
+ -del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\_javascript_Core\DerivedSources\LLIntAssembly.h"
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make (154353 => 154354)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make 2013-08-20 20:23:35 UTC (rev 154353)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make 2013-08-20 20:45:34 UTC (rev 154354)
@@ -6,4 +6,4 @@
clean:
-del "%ConfigurationBuildDir%\buildfailed"
- -del /s /q "%ConfigurationBuildDir%\obj32\_javascript_Core\DerivedSources\LLIntDesiredOffsets.h"
+ -del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\_javascript_Core\DerivedSources\LLIntDesiredOffsets.h"
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/copy-files.cmd (154353 => 154354)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/copy-files.cmd 2013-08-20 20:23:35 UTC (rev 154353)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/copy-files.cmd 2013-08-20 20:45:34 UTC (rev 154354)
@@ -2,7 +2,7 @@
set PublicHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\_javascript_Core
set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\_javascript_Core
-set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin32\_javascript_Core.resources
+set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\_javascript_Core.resources
if "%1" EQU "clean" goto :clean
if "%1" EQU "rebuild" call :clean
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscCommon.props (154353 => 154354)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscCommon.props 2013-08-20 20:23:35 UTC (rev 154353)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscCommon.props 2013-08-20 20:45:34 UTC (rev 154354)
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\;..\..\tools\;..\..\runtime\;..\..\llint\;..\..\jit\;..\..\disassembler\;..\..\heap\;..\..\debugger\;..\..\assembler\;..\..\profiler\;..\..\interpreter\;..\..\bytecode\;..\..\dfg\;..\..\bytecompiler\;..\..\parser\;..\..\API\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\private\;$(ConfigurationBuildDir)\include\_javascript_Core\;$(ConfigurationBuildDir)\obj32\_javascript_Core\DerivedSources\;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\;..\..\tools\;..\..\runtime\;..\..\llint\;..\..\jit\;..\..\disassembler\;..\..\heap\;..\..\debugger\;..\..\assembler\;..\..\profiler\;..\..\interpreter\;..\..\bytecode\;..\..\dfg\;..\..\bytecompiler\;..\..\parser\;..\..\API\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\private\;$(ConfigurationBuildDir)\include\_javascript_Core\;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\_javascript_Core\DerivedSources\;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>ICUVersion.h</ForcedIncludeFiles>
</ClCompile>
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpCommon.props (154353 => 154354)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpCommon.props 2013-08-20 20:23:35 UTC (rev 154353)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpCommon.props 2013-08-20 20:45:34 UTC (rev 154354)
@@ -6,7 +6,7 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CONSOLE;__STD_C;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\_javascript_Core;$(ConfigurationBuildDir)\obj32\_javascript_Core\DerivedSources;..\..\;..\..\os-win32;..\..\assembler;..\..\API;..\..\parser;..\..\heap;..\..\runtime;..\..\bytecode;..\..\interpreter;..\..\debugger;..\..\bytecompiler;..\..\profiler;..\..\jit;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\_javascript_Core;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\_javascript_Core\DerivedSources;..\..\;..\..\os-win32;..\..\assembler;..\..\API;..\..\parser;..\..\heap;..\..\runtime;..\..\bytecode;..\..\interpreter;..\..\debugger;..\..\bytecompiler;..\..\profiler;..\..\jit;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>_javascript_Core$(DebugSuffix).lib;libicuin$(DebugSuffix).lib;libicuuc$(DebugSuffix).lib;WTF$(DebugSuffix).lib;winmm.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
Modified: trunk/Source/WebKit/ChangeLog (154353 => 154354)
--- trunk/Source/WebKit/ChangeLog 2013-08-20 20:23:35 UTC (rev 154353)
+++ trunk/Source/WebKit/ChangeLog 2013-08-20 20:45:34 UTC (rev 154354)
@@ -1,5 +1,14 @@
2013-08-20 Alex Christensen <[email protected]>
+ <https://webkit.org/b/120076> More work towards a Win64 build
+
+ Reviewed by Brent Fulgham.
+
+ * WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
+ Use PlatformArchitecture macro instead of bin32, lib32, and obj32.
+
+2013-08-20 Alex Christensen <[email protected]>
+
Use PlatformArchitecture to distinguish between 32-bit and 64-bit builds on Windows.
https://bugs.webkit.org/show_bug.cgi?id=119512
Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd (154353 => 154354)
--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2013-08-20 20:23:35 UTC (rev 154353)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2013-08-20 20:45:34 UTC (rev 154354)
@@ -5,5 +5,5 @@
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\obj32\WebKit\%PROJECTNAME%"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKit\%PROJECTNAME%"
bash "%WEBKIT_LIBRARIES%\tools\scripts\auto-version.sh" "%INTDIR%"
