Title: [229434] trunk/Source/WebCore
Revision
229434
Author
[email protected]
Date
2018-03-08 14:15:11 -0800 (Thu, 08 Mar 2018)

Log Message

[Win] Compile error: pal/ExportMacros.h not found.
https://bugs.webkit.org/show_bug.cgi?id=183467

Reviewed by Brent Fulgham.

PAL header files are no longer located under the WebCore folder in forwarding headers. An additional
build step is required to copy the PAL header files to the internal include folder.

No new tests, no change in functionality.

* PlatformWin.cmake:
* WebCore.vcxproj/WebCore.proj:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (229433 => 229434)


--- trunk/Source/WebCore/ChangeLog	2018-03-08 21:55:37 UTC (rev 229433)
+++ trunk/Source/WebCore/ChangeLog	2018-03-08 22:15:11 UTC (rev 229434)
@@ -1,3 +1,18 @@
+2018-03-08  Per Arne Vollan  <[email protected]>
+
+        [Win] Compile error: pal/ExportMacros.h not found.
+        https://bugs.webkit.org/show_bug.cgi?id=183467
+
+        Reviewed by Brent Fulgham.
+
+        PAL header files are no longer located under the WebCore folder in forwarding headers. An additional
+        build step is required to copy the PAL header files to the internal include folder.
+
+        No new tests, no change in functionality. 
+
+        * PlatformWin.cmake:
+        * WebCore.vcxproj/WebCore.proj:
+
 2018-03-08  Megan Gardner  <[email protected]>
 
         Ensure system appearance is default for legacy webkit

Modified: trunk/Source/WebCore/PlatformWin.cmake (229433 => 229434)


--- trunk/Source/WebCore/PlatformWin.cmake	2018-03-08 21:55:37 UTC (rev 229433)
+++ trunk/Source/WebCore/PlatformWin.cmake	2018-03-08 22:15:11 UTC (rev 229434)
@@ -1,6 +1,7 @@
 add_definitions(/bigobj -D__STDC_CONSTANT_MACROS)
 
 list(APPEND WebCore_INCLUDE_DIRECTORIES
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     "${CMAKE_BINARY_DIR}/../include/private"
     "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core"
     "${WEBCORE_DIR}/accessibility/win"

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (229433 => 229434)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj	2018-03-08 21:55:37 UTC (rev 229433)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj	2018-03-08 22:15:11 UTC (rev 229434)
@@ -68,6 +68,9 @@
     <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\WebCore\**\*.*">
       <Output TaskParameter="Include" ItemName="IncFiles" />
     </CreateItem>
+    <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\pal\**\*.*">
+      <Output TaskParameter="Include" ItemName="IncFilesPal" />
+    </CreateItem>
     <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
       <Output TaskParameter="Include" ItemName="Bin32Files" />
     </CreateItem>
@@ -94,6 +97,7 @@
     </CreateItem>
 
     <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\WebCore\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(IncFilesPal)" DestinationFiles="@(IncFilesPal->'$(DSTROOT)\AppleInternal\include\private\pal\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to