From d12945e49aaa55e003c8d2baca1b674b1e2ab810 Mon Sep 17 00:00:00 2001 From: "mrowe@apple.com" Date: Fri, 2 Oct 2009 02:50:27 +0000 Subject: [PATCH] Fix the Tiger build. Don't unconditionally enable 3D canvas as it is not supported on Tiger. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49008 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- JavaScriptCore/ChangeLog | 6 ++++++ JavaScriptCore/Configurations/FeatureDefines.xcconfig | 4 +++- WebCore/ChangeLog | 6 ++++++ WebCore/Configurations/FeatureDefines.xcconfig | 4 +++- WebKit/mac/ChangeLog | 6 ++++++ WebKit/mac/Configurations/FeatureDefines.xcconfig | 4 +++- 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 4c9e4cfdd84..9914a91783b 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,9 @@ +2009-10-01 Mark Rowe + + Fix the Tiger build. Don't unconditionally enable 3D canvas as it is not supported on Tiger. + + * Configurations/FeatureDefines.xcconfig: + 2009-10-01 Yongjun Zhang Reviewed by Darin Adler. diff --git a/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/JavaScriptCore/Configurations/FeatureDefines.xcconfig index 9a37a6396e8..ed387aa242c 100644 --- a/JavaScriptCore/Configurations/FeatureDefines.xcconfig +++ b/JavaScriptCore/Configurations/FeatureDefines.xcconfig @@ -28,7 +28,9 @@ // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature. -ENABLE_3D_CANVAS = ; +ENABLE_3D_CANVAS = $(ENABLE_3D_CANVAS_$(MAC_OS_X_VERSION_MAJOR)); +ENABLE_3D_CANVAS_1050 = ENABLE_3D_CANVAS; +ENABLE_3D_CANVAS_1060 = ENABLE_3D_CANVAS; ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(MAC_OS_X_VERSION_MAJOR)); ENABLE_3D_RENDERING_1050 = ENABLE_3D_RENDERING; diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 44b8d00ad5e..11acf951d89 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,9 @@ +2009-10-01 Mark Rowe + + Fix the Tiger build. Don't unconditionally enable 3D canvas as it is not supported on Tiger. + + * Configurations/FeatureDefines.xcconfig: + 2009-10-01 Chris Marrin Reviewed by Oliver Hunt. diff --git a/WebCore/Configurations/FeatureDefines.xcconfig b/WebCore/Configurations/FeatureDefines.xcconfig index ffc412e218e..ed387aa242c 100644 --- a/WebCore/Configurations/FeatureDefines.xcconfig +++ b/WebCore/Configurations/FeatureDefines.xcconfig @@ -28,7 +28,9 @@ // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature. -ENABLE_3D_CANVAS = ENABLE_3D_CANVAS; +ENABLE_3D_CANVAS = $(ENABLE_3D_CANVAS_$(MAC_OS_X_VERSION_MAJOR)); +ENABLE_3D_CANVAS_1050 = ENABLE_3D_CANVAS; +ENABLE_3D_CANVAS_1060 = ENABLE_3D_CANVAS; ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(MAC_OS_X_VERSION_MAJOR)); ENABLE_3D_RENDERING_1050 = ENABLE_3D_RENDERING; diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog index 19752164f8a..f7568d021ac 100644 --- a/WebKit/mac/ChangeLog +++ b/WebKit/mac/ChangeLog @@ -1,3 +1,9 @@ +2009-10-01 Mark Rowe + + Fix the Tiger build. Don't unconditionally enable 3D canvas as it is not supported on Tiger. + + * Configurations/FeatureDefines.xcconfig: + 2009-10-01 Chris Marrin Reviewed by Oliver Hunt. diff --git a/WebKit/mac/Configurations/FeatureDefines.xcconfig b/WebKit/mac/Configurations/FeatureDefines.xcconfig index ffc412e218e..ed387aa242c 100644 --- a/WebKit/mac/Configurations/FeatureDefines.xcconfig +++ b/WebKit/mac/Configurations/FeatureDefines.xcconfig @@ -28,7 +28,9 @@ // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature. -ENABLE_3D_CANVAS = ENABLE_3D_CANVAS; +ENABLE_3D_CANVAS = $(ENABLE_3D_CANVAS_$(MAC_OS_X_VERSION_MAJOR)); +ENABLE_3D_CANVAS_1050 = ENABLE_3D_CANVAS; +ENABLE_3D_CANVAS_1060 = ENABLE_3D_CANVAS; ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(MAC_OS_X_VERSION_MAJOR)); ENABLE_3D_RENDERING_1050 = ENABLE_3D_RENDERING; -- GitLab