Title: [235872] trunk
Revision
235872
Author
timothy_hor...@apple.com
Date
2018-09-10 16:24:45 -0700 (Mon, 10 Sep 2018)

Log Message

Make it easier to build for SDK_VARIANT=iosmac
https://bugs.webkit.org/show_bug.cgi?id=189488
<rdar://problem/38254840>

Reviewed by Wenson Hsieh.

* Makefile:
* Makefile.shared:
* Source/Makefile:
Set a variety of build flags (disable libwebrtc, tools, and set
SDK_VARIANT and WK_ALTERNATE_FRAMEWORKS_DIR).

Modified Paths

Diff

Modified: trunk/ChangeLog (235871 => 235872)


--- trunk/ChangeLog	2018-09-10 23:15:32 UTC (rev 235871)
+++ trunk/ChangeLog	2018-09-10 23:24:45 UTC (rev 235872)
@@ -1,3 +1,17 @@
+2018-09-10  Tim Horton  <timothy_hor...@apple.com>
+
+        Make it easier to build for SDK_VARIANT=iosmac
+        https://bugs.webkit.org/show_bug.cgi?id=189488
+        <rdar://problem/38254840>
+
+        Reviewed by Wenson Hsieh.
+
+        * Makefile:
+        * Makefile.shared:
+        * Source/Makefile:
+        Set a variety of build flags (disable libwebrtc, tools, and set
+        SDK_VARIANT and WK_ALTERNATE_FRAMEWORKS_DIR).
+
 2018-08-30  Don Olmstead  <don.olmst...@sony.com>
 
         [CMake] Replace AVFoundationSupport.py using CMake

Modified: trunk/Makefile (235871 => 235872)


--- trunk/Makefile	2018-09-10 23:15:32 UTC (rev 235871)
+++ trunk/Makefile	2018-09-10 23:24:45 UTC (rev 235872)
@@ -1,5 +1,9 @@
 TOOLS_MODULE = Tools
 
+ifeq (iosmac,$(SDK_VARIANT))
+	DISABLE_WEBKIT_TOOLS = 1
+endif
+
 ifneq (,$(DISABLE_WEBKIT_TOOLS))
 	TOOLS_MODULE =
 endif

Modified: trunk/Makefile.shared (235871 => 235872)


--- trunk/Makefile.shared	2018-09-10 23:15:32 UTC (rev 235871)
+++ trunk/Makefile.shared	2018-09-10 23:24:45 UTC (rev 235872)
@@ -34,6 +34,11 @@
 	endif
 endif
 
+ifeq (iosmac,$(SDK_VARIANT))
+	XCODE_OPTIONS += SDK_VARIANT=iosmac
+	XCODE_OPTIONS += WK_ALTERNATE_FRAMEWORKS_DIR=/System/iOSSupport
+endif
+
 DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
 VERBOSITY ?= $(DEFAULT_VERBOSITY)
 

Modified: trunk/Source/Makefile (235871 => 235872)


--- trunk/Source/Makefile	2018-09-10 23:15:32 UTC (rev 235871)
+++ trunk/Source/Makefile	2018-09-10 23:24:45 UTC (rev 235872)
@@ -1,6 +1,10 @@
 LIBWEBRTC_MODULE = 
 WEBINSPECTORUI_MODULE =
 
+ifeq (iosmac,$(SDK_VARIANT))
+	DISABLE_LIBWEBRTC = 1
+endif
+
 ifneq (,$(SDKROOT))
 	ifneq (,$(findstring iphone,$(SDKROOT)))
 		LIBWEBRTC_MODULE = ThirdParty/libwebrtc
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to