diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-02 19:50:07 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-02 19:50:07 +0000 |
| commit | 2805eca5e8803849707dbc8ec8cf6f8a23f9b9fc (patch) | |
| tree | fa65acbea461ab2de703d2de7499050f8e50374e | |
| parent | 232b5c8421caa63d1aaa543a20abcd1c24307771 (diff) | |
| download | chromium_src-2805eca5e8803849707dbc8ec8cf6f8a23f9b9fc.zip chromium_src-2805eca5e8803849707dbc8ec8cf6f8a23f9b9fc.tar.gz chromium_src-2805eca5e8803849707dbc8ec8cf6f8a23f9b9fc.tar.bz2 | |
Make jsbindings build almost all of the way on the Mac. The remaining errors
are StaticConstructors.h (fixed in another change), some stuff about database
support in V8DOMWindow.cpp (looks like the #ifdefs aren't quite right), and
something else about the frame loader client being pure virtual. The fixes
here are just the fixes doable in the project file, and mostly involve changes
to FEATURE_DEFINES and HEADER_SEARCH_PATHS.
Review URL: http://codereview.chromium.org/6202
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2799 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 506784e..2648ca3 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -8300,7 +8300,7 @@ DIR_V8 = "$(XCODEPROJ_DEPTH)/v8"; DIR_WEBCORE = "$(DIR_WEBKIT)/WebCore"; DIR_WEBKIT = "$(DIR_THIRD_PARTY)/WebKit"; - FEATURE_DEFINES = "ENABLE_CROSS_DOCUMENT_MESSAGING ENABLE_SVG ENABLE_SVG_AS_IMAGE ENABLE_SVG_USE ENABLE_SVG_FOREIGN_OBJECT ENABLE_XPATH ENABLE_XSLT GOOGLE_WEBKIT_WITHOUT_GLUE_DEPENDENCY"; + FEATURE_DEFINES = "ENABLE_DATABASE=0 ENABLE_DASHBOARD_SUPPORT=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 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1 GOOGLE_WEBKIT_WITHOUT_GLUE_DEPENDENCY=1"; FRAMEWORK_SEARCH_PATHS = ( "$(FRAMEWORK_SEARCH_PATHS)", "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", @@ -8308,7 +8308,7 @@ ); GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", - BUILDING_CHROMIUM__, + "BUILDING_CHROMIUM__=1", "$(FEATURE_DEFINES)", ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; @@ -8317,6 +8317,7 @@ .., "$(DIR_THIRD_PARTY)/icu38/public/common", "$(DIR_THIRD_PARTY)/icu38/public/i18n", + "$(DIR_THIRD_PARTY)/npapi", "$(DIR_PORT)", "$(DIR_PORT)/bindings", "$(DIR_PORT)/bindings/v8", @@ -8377,7 +8378,9 @@ "$(DIR_WEBCORE)/platform/text/mac", "$(DIR_WEBCORE)/plugins", "$(DIR_WEBCORE)/rendering", + "$(DIR_WEBCORE)/rendering/style", "$(DIR_WEBCORE)/svg", + "$(DIR_WEBCORE)/svg/animation", "$(DIR_WEBCORE)/svg/graphics", "$(DIR_WEBCORE)/svg/graphics/cg", "$(DIR_WEBCORE)/svg/graphics/filters", @@ -8409,7 +8412,7 @@ DIR_V8 = "$(XCODEPROJ_DEPTH)/v8"; DIR_WEBCORE = "$(DIR_WEBKIT)/WebCore"; DIR_WEBKIT = "$(DIR_THIRD_PARTY)/WebKit"; - FEATURE_DEFINES = "ENABLE_CROSS_DOCUMENT_MESSAGING ENABLE_SVG ENABLE_SVG_AS_IMAGE ENABLE_SVG_USE ENABLE_SVG_FOREIGN_OBJECT ENABLE_XPATH ENABLE_XSLT GOOGLE_WEBKIT_WITHOUT_GLUE_DEPENDENCY"; + FEATURE_DEFINES = "ENABLE_DATABASE=0 ENABLE_DASHBOARD_SUPPORT=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 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1 GOOGLE_WEBKIT_WITHOUT_GLUE_DEPENDENCY=1"; FRAMEWORK_SEARCH_PATHS = ( "$(FRAMEWORK_SEARCH_PATHS)", "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", @@ -8417,7 +8420,7 @@ ); GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", - BUILDING_CHROMIUM__, + "BUILDING_CHROMIUM__=1", "$(FEATURE_DEFINES)", ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; @@ -8426,6 +8429,7 @@ .., "$(DIR_THIRD_PARTY)/icu38/public/common", "$(DIR_THIRD_PARTY)/icu38/public/i18n", + "$(DIR_THIRD_PARTY)/npapi", "$(DIR_PORT)", "$(DIR_PORT)/bindings", "$(DIR_PORT)/bindings/v8", @@ -8486,7 +8490,9 @@ "$(DIR_WEBCORE)/platform/text/mac", "$(DIR_WEBCORE)/plugins", "$(DIR_WEBCORE)/rendering", + "$(DIR_WEBCORE)/rendering/style", "$(DIR_WEBCORE)/svg", + "$(DIR_WEBCORE)/svg/animation", "$(DIR_WEBCORE)/svg/graphics", "$(DIR_WEBCORE)/svg/graphics/cg", "$(DIR_WEBCORE)/svg/graphics/filters", |