Title: [161715] trunk/Source/WebCore
- Revision
- 161715
- Author
- [email protected]
- Date
- 2014-01-10 18:26:39 -0800 (Fri, 10 Jan 2014)
Log Message
[iOS] Build fix: make sure WTF_PLATFORM_IOS is defined when preprocessing
* DerivedSources.make:
* bindings/scripts/preprocessor.pm:
(applyPreprocessor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161714 => 161715)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 02:25:33 UTC (rev 161714)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 02:26:39 UTC (rev 161715)
@@ -1,3 +1,11 @@
+2014-01-10 Andy Estes <[email protected]>
+
+ [iOS] Build fix: make sure WTF_PLATFORM_IOS is defined when preprocessing
+
+ * DerivedSources.make:
+ * bindings/scripts/preprocessor.pm:
+ (applyPreprocessor):
+
2014-01-10 Simon Fraser <[email protected]>
Use TARGET_OS_IPHONE in this API file, and #if TARGET_OS_MAC
Modified: trunk/Source/WebCore/DerivedSources.make (161714 => 161715)
--- trunk/Source/WebCore/DerivedSources.make 2014-01-11 02:25:33 UTC (rev 161714)
+++ trunk/Source/WebCore/DerivedSources.make 2014-01-11 02:26:39 UTC (rev 161715)
@@ -789,11 +789,11 @@
WEBCORE_CSS_VALUE_KEYWORDS := $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/SVGCSSValueKeywords.in
endif
-CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl $(PLATFORM_FEATURE_DEFINES)
+CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
perl -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
-CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl $(PLATFORM_FEATURE_DEFINES)
+CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
cat $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
perl -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
Modified: trunk/Source/WebCore/bindings/scripts/preprocessor.pm (161714 => 161715)
--- trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2014-01-11 02:25:33 UTC (rev 161714)
+++ trunk/Source/WebCore/bindings/scripts/preprocessor.pm 2014-01-11 02:26:39 UTC (rev 161715)
@@ -57,9 +57,10 @@
push(@args, qw(-E -P -x c++));
}
- if ($Config::Config{"osname"} eq "darwin" && $ENV{SDKROOT}) {
+ if ($Config::Config{"osname"} eq "darwin") {
push(@args, "-I" . $ENV{BUILT_PRODUCTS_DIR} . "/usr/local/include") if $ENV{BUILT_PRODUCTS_DIR};
push(@args, "-isysroot", $ENV{SDKROOT}) if $ENV{SDKROOT};
+ $defines .= " WTF_PLATFORM_IOS" if $ENV{PLATFORM_NAME} =~ /iphone(os|simulator)/;
}
# Remove double quotations from $defines and extract macros.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
