[webkit-changes] [111562] trunk/Source/JavaScriptCore

Wed, 21 Mar 2012 10:18:12 -0700

Title: [111562] trunk/Source/_javascript_Core
Revision
111562
Author
[email protected]
Date
2012-03-21 10:18:06 -0700 (Wed, 21 Mar 2012)

Log Message

More Windows build fixing.

* _javascript_Core.vcproj/_javascript_Core/_javascript_CoreCommon.vsprops:
Fix the order of the include directories to look in include/private first before looking
in include/private/_javascript_Core.
* _javascript_Core.vcproj/_javascript_Core/_javascript_CoreReleasePGO.vsprops:
Look in the Production output directory (where the wtf headers will be). This is the same
thing that is done for jsc and testRegExp in ReleasePGO.


Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (111561 => 111562)


--- trunk/Source/_javascript_Core/ChangeLog	2012-03-21 17:18:00 UTC (rev 111561)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-03-21 17:18:06 UTC (rev 111562)
@@ -1,5 +1,16 @@
 2012-03-21  Jessie Berlin  <[email protected]>
 
+        More Windows build fixing.
+
+        * _javascript_Core.vcproj/_javascript_Core/_javascript_CoreCommon.vsprops:
+        Fix the order of the include directories to look in include/private first before looking
+        in include/private/_javascript_Core.
+        * _javascript_Core.vcproj/_javascript_Core/_javascript_CoreReleasePGO.vsprops:
+        Look in the Production output directory (where the wtf headers will be). This is the same
+        thing that is done for jsc and testRegExp in ReleasePGO.
+
+2012-03-21  Jessie Berlin  <[email protected]>
+
         WTF headers should be in $(ConfigurationBuildDir)\include\private\wtf, not
         $(ConfigurationBuildDir)\include\private\_javascript_Core\wtf.
         https://bugs.webkit.org/show_bug.cgi?id=81739

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreCommon.vsprops (111561 => 111562)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreCommon.vsprops	2012-03-21 17:18:00 UTC (rev 111561)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreCommon.vsprops	2012-03-21 17:18:06 UTC (rev 111562)
@@ -6,7 +6,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\obj\_javascript_Core\DerivedSources\&quot;;../../;../../API/;../../parser/;../../bytecompiler/;../../dfg/;../../jit/;../../llint/;../../runtime/;../../tools/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;../../heap/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\_javascript_Core&quot;;&quot;$(ConfigurationBuildDir)\include\private\_javascript_Core&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
+		AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\obj\_javascript_Core\DerivedSources\&quot;;../../;../../API/;../../parser/;../../bytecompiler/;../../dfg/;../../jit/;../../llint/;../../runtime/;../../tools/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;../../heap/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\_javascript_Core&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include\private\_javascript_Core&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
 		PreprocessorDefinitions="__STD_C"
 		ForcedIncludeFiles="ICUVersion.h"
 	/>

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreReleasePGO.vsprops (111561 => 111562)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreReleasePGO.vsprops	2012-03-21 17:18:00 UTC (rev 111561)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_CoreReleasePGO.vsprops	2012-03-21 17:18:06 UTC (rev 111562)
@@ -9,4 +9,8 @@
 		Name="VCLinkerTool"
 		AdditionalLibraryDirectories="&quot;$(ConfigurationBuildDir)\..\Production\lib&quot;"
 	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\..\Production\include\private&quot;"
+	/>
 </VisualStudioPropertySheet>

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to