Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (248303 => 248304)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2019-08-06 17:37:08 UTC (rev 248303)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2019-08-06 17:37:39 UTC (rev 248304)
@@ -1307,7 +1307,9 @@
# dependency of _javascript_Core for CMake Visual Studio generator to
# eliminate duplicated custom commands. Otherwise,
# CombinedDomains.json will be generated in both projects.
-add_dependencies(_javascript_Core_CopyPrivateHeaders _javascript_Core)
+if (NOT INTERNAL_BUILD)
+ add_dependencies(_javascript_Core_CopyPrivateHeaders _javascript_Core)
+endif ()
target_include_directories(LLIntSettingsExtractor PRIVATE
${_javascript_Core_INCLUDE_DIRECTORIES}
Modified: trunk/Source/_javascript_Core/ChangeLog (248303 => 248304)
--- trunk/Source/_javascript_Core/ChangeLog 2019-08-06 17:37:08 UTC (rev 248303)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-08-06 17:37:39 UTC (rev 248304)
@@ -1,3 +1,13 @@
+2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200455
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+ * shell/CMakeLists.txt:
+
2019-08-05 Devin Rousso <drou...@apple.com>
Web Inspector: Styles: show @supports CSS groupings
Modified: trunk/Source/_javascript_Core/shell/CMakeLists.txt (248303 => 248304)
--- trunk/Source/_javascript_Core/shell/CMakeLists.txt 2019-08-06 17:37:08 UTC (rev 248303)
+++ trunk/Source/_javascript_Core/shell/CMakeLists.txt 2019-08-06 17:37:39 UTC (rev 248304)
@@ -21,6 +21,10 @@
list(APPEND jsc_LIBRARIES edit)
endif ()
+if (WIN32)
+ list(APPEND jsc_LIBRARIES Winmm)
+endif ()
+
WEBKIT_EXECUTABLE_DECLARE(jsc)
if (DEVELOPER_MODE)
Modified: trunk/Source/WebKitLegacy/CMakeLists.txt (248303 => 248304)
--- trunk/Source/WebKitLegacy/CMakeLists.txt 2019-08-06 17:37:08 UTC (rev 248303)
+++ trunk/Source/WebKitLegacy/CMakeLists.txt 2019-08-06 17:37:39 UTC (rev 248304)
@@ -42,7 +42,9 @@
WEBKIT_FRAMEWORK(WebKitLegacy)
-add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
+if (NOT INTERNAL_BUILD)
+ add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
+endif ()
if (TARGET WebKitLegacyGUID)
add_dependencies(WebKitLegacy WebKitLegacyGUID)
endif ()
Modified: trunk/Source/WebKitLegacy/ChangeLog (248303 => 248304)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-08-06 17:37:08 UTC (rev 248303)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-08-06 17:37:39 UTC (rev 248304)
@@ -1,3 +1,14 @@
+2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200455
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+ * WebKitLegacy.vcxproj/WebKitLegacy.proj:
+
2019-07-31 Keith Rollin <krol...@apple.com>
Update WebKitLegacy for XCBuild
Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (248303 => 248304)
--- trunk/Source/WebKitLegacy/PlatformWin.cmake 2019-08-06 17:37:08 UTC (rev 248303)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2019-08-06 17:37:39 UTC (rev 248304)
@@ -486,7 +486,9 @@
FILES ${WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS}
FLATTENED
)
-add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
+if (NOT INTERNAL_BUILD)
+ add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
+endif ()
set(WebKitLegacy_OUTPUT_NAME
WebKit${DEBUG_SUFFIX}
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (248303 => 248304)
--- trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2019-08-06 17:37:08 UTC (rev 248303)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2019-08-06 17:37:39 UTC (rev 248304)
@@ -28,7 +28,7 @@
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
- <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+ <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
</PropertyGroup>
<!-- Prepare for build -->
