diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 02:46:47 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 02:46:47 +0000 |
| commit | 3ef4a79cc1d4659939b02258b39f78536c0c9d2d (patch) | |
| tree | f218160a58fc92f1c11b9d4c9e47b4206cfae8f0 | |
| parent | 8e8a109621f2d90864590de9f8ab3952444e148c (diff) | |
| download | chromium_src-3ef4a79cc1d4659939b02258b39f78536c0c9d2d.zip chromium_src-3ef4a79cc1d4659939b02258b39f78536c0c9d2d.tar.gz chromium_src-3ef4a79cc1d4659939b02258b39f78536c0c9d2d.tar.bz2 | |
Use the proper WebKit feature defines when building TestShell and
test_shell_tests.
Review URL: http://codereview.chromium.org/13359
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6774 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj index 7225205..37bc1e6 100644 --- a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj +++ b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj @@ -2100,6 +2100,12 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7B8200960E76FDA1008F45CF /* debug.xcconfig */; buildSettings = { + FEATURE_DEFINES = "ENABLE_DATABASE=1 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_XSLT=1 ENABLE_XPATH=1 ENABLE_SVG=1 ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_USE=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_FONTS=1 ENABLE_VIDEO=0 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + "$(FEATURE_DEFINES)", + BUILDING_CHROMIUM__, + ); XCODEPROJ_DEPTH = ../../../..; }; name = Debug; @@ -2108,6 +2114,12 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7B8200980E76FDA1008F45CF /* release.xcconfig */; buildSettings = { + FEATURE_DEFINES = "ENABLE_DATABASE=1 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_XSLT=1 ENABLE_XPATH=1 ENABLE_SVG=1 ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_USE=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_FONTS=1 ENABLE_VIDEO=0 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + "$(FEATURE_DEFINES)", + BUILDING_CHROMIUM__, + ); XCODEPROJ_DEPTH = ../../../..; }; name = Release; @@ -2116,7 +2128,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7B8200970E76FDA1008F45CF /* executable.xcconfig */; buildSettings = { - FEATURE_DEFINES = "ENABLE_DATABASE=1 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_XSLT=1 ENABLE_XPATH=1 ENABLE_SVG=1 ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_USE=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_FONTS=1 ENABLE_VIDEO=0 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1"; FRAMEWORK_SEARCH_PATHS = ( "$(FRAMEWORK_SEARCH_PATHS)", "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", @@ -2125,7 +2136,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", UNIT_TEST, - BUILDING_CHROMIUM__, ); HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS)", @@ -2152,6 +2162,7 @@ ../../../../third_party/WebKit/WebCore/platform/text, ../../../../third_party/WebKit/WebCore/rendering, ../../../../third_party/WebKit/WebCore/rendering/style, + ../../../../third_party/WebKit/WebCore/svg, ../../../../third_party/WebKit/WebKit/mac/WebCoreSupport, ../../../../third_party/WebKit/JavaScriptCore/wtf, ../../../../third_party/WebKit/JavaScriptCore, @@ -2177,7 +2188,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7B8200970E76FDA1008F45CF /* executable.xcconfig */; buildSettings = { - FEATURE_DEFINES = "ENABLE_DATABASE=1 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_XSLT=1 ENABLE_XPATH=1 ENABLE_SVG=1 ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_USE=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_FONTS=1 ENABLE_VIDEO=0 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1"; FRAMEWORK_SEARCH_PATHS = ( "$(FRAMEWORK_SEARCH_PATHS)", "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", @@ -2186,7 +2196,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", UNIT_TEST, - BUILDING_CHROMIUM__, ); HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS)", @@ -2213,6 +2222,7 @@ ../../../../third_party/WebKit/WebCore/platform/text, ../../../../third_party/WebKit/WebCore/rendering, ../../../../third_party/WebKit/WebCore/rendering/style, + ../../../../third_party/WebKit/WebCore/svg, ../../../../third_party/WebKit/WebKit/mac/WebCoreSupport, ../../../../third_party/WebKit/JavaScriptCore/wtf, ../../../../third_party/WebKit/JavaScriptCore, @@ -2257,10 +2267,6 @@ "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", ); GCC_PREFIX_HEADER = TestShell_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - BUILDING_CHROMIUM__, - ); HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS)", ../../../.., @@ -2296,10 +2302,6 @@ "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", ); GCC_PREFIX_HEADER = TestShell_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - BUILDING_CHROMIUM__, - ); HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS)", ../../../.., |