Title: [240738] trunk/Source/WebCore
Revision
240738
Author
jer.no...@apple.com
Date
2019-01-30 16:33:41 -0800 (Wed, 30 Jan 2019)

Log Message

Ensure ENABLE_MEDIA_SOURCE is defined inside DerivedSources.make
https://bugs.webkit.org/show_bug.cgi?id=194063

Reviewed by Jon Lee.

* DerivedSources.make:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (240737 => 240738)


--- trunk/Source/WebCore/ChangeLog	2019-01-30 23:54:04 UTC (rev 240737)
+++ trunk/Source/WebCore/ChangeLog	2019-01-31 00:33:41 UTC (rev 240738)
@@ -1,3 +1,12 @@
+2019-01-30  Jer Noble  <jer.no...@apple.com>
+
+        Ensure ENABLE_MEDIA_SOURCE is defined inside DerivedSources.make
+        https://bugs.webkit.org/show_bug.cgi?id=194063
+
+        Reviewed by Jon Lee.
+
+        * DerivedSources.make:
+
 2019-01-30  Youenn Fablet  <you...@apple.com>
 
         Refactor ServiceWorkerJob management by ServiceWorkerContainer to make it more memory safe

Modified: trunk/Source/WebCore/DerivedSources.make (240737 => 240738)


--- trunk/Source/WebCore/DerivedSources.make	2019-01-30 23:54:04 UTC (rev 240737)
+++ trunk/Source/WebCore/DerivedSources.make	2019-01-31 00:33:41 UTC (rev 240738)
@@ -1135,6 +1135,10 @@
     ENABLE_ORIENTATION_EVENTS = 1
 endif
 
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_MEDIA_SOURCE | cut -d' ' -f3), 1)
+	ENABLE_MEDIA_SOURCE = 1
+endif
+
 ifeq ($(WTF_PLATFORM_IOS_FAMILY), 1)
 FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES) WTF_PLATFORM_IOS_FAMILY
 else ifeq ($(WTF_PLATFORM_MAC), 1)
@@ -1262,6 +1266,10 @@
     ENABLE_ORIENTATION_EVENTS = 0
 endif
 
+ifndef ENABLE_MEDIA_SOURCE
+	ENABLE_MEDIA_SOURCE = 0
+endif
+
 ifeq ($(ENABLE_ORIENTATION_EVENTS), 1)
     ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_ORIENTATION_EVENTS
 endif
@@ -1270,6 +1278,10 @@
     ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) USE_APPLE_INTERNAL_SDK
 endif
 
+ifeq ($(ENABLE_MEDIA_SOURCE), 1)
+    ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_MEDIA_SOURCE
+endif
+
 # CSS property names and value keywords
 
 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSProperties.json
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to