Commit eedf75a5 authored by thatcher's avatar thatcher

64-bit build fix.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@20256 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 82d48635
......@@ -5,8 +5,8 @@ EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
EXPORTED_SYMBOLS_FILE_ = WebCore.exp;
EXPORTED_SYMBOLS_FILE_i386 = WebCore.exp;
EXPORTED_SYMBOLS_FILE_ppc = WebCore.exp;
EXPORTED_SYMBOLS_FILE_ppc64 = "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp";
EXPORTED_SYMBOLS_FILE_x86_64 = "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp";
EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp;
EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp;
FEATURE_DEFINES = ENABLE_SVG ENABLE_XPATH ENABLE_XSLT;
GCC_PREFIX_HEADER = WebCorePrefix.h;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
......
......@@ -21,4 +21,5 @@ GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
LINKER_DISPLAYS_MANGLED_NAMES = YES;
PREBINDING = NO;
VALID_ARCHS = i386 ppc x86_64 ppc64;
WARNING_CFLAGS = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double -Wundef -Wshorten-64-to-32;
// FIXME: <rdar://problem/5070292> WebKit should build with -Wshorten-64-to-32
WARNING_CFLAGS = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double -Wundef;
#include "Version.xcconfig"
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = $(MAJOR_BUNDLE_VERSION).$(MINOR_BUNDLE_VERSION).$(TINY_BUNDLE_VERSION);
EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
EXPORTED_SYMBOLS_FILE_ = WebKit.exp;
EXPORTED_SYMBOLS_FILE_i386 = WebKit.exp;
EXPORTED_SYMBOLS_FILE_ppc = WebKit.exp;
EXPORTED_SYMBOLS_FILE_ppc64 = "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp";
EXPORTED_SYMBOLS_FILE_x86_64 = "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp";
EXPORTED_SYMBOLS_FILE = WebKit.exp;
FEATURE_DEFINES = ENABLE_SVG ENABLE_XPATH ENABLE_XSLT;
FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS);
GCC_PREFIX_HEADER = WebKitPrefix.h;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM $(GCC_PREPROCESSOR_DEFINITIONS);
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit $(GCC_PREPROCESSOR_DEFINITIONS);
HEADER_SEARCH_PATHS = ForwardingHeaders icu "${BUILT_PRODUCTS_DIR}/usr/local/include" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit" $(HEADER_SEARCH_PATHS);
INFOPLIST_FILE = Info.plist;
INFOPLIST_PREPROCESS = YES;
......
......@@ -1296,6 +1296,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
knownRegions = (
English,
......@@ -1310,6 +1311,7 @@
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
projectRoot = "";
shouldCheckCompatibility = 1;
targets = (
9398100A0824BF01008DF038 /* WebKit */,
);
......@@ -1553,7 +1555,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
buildSettings = {
DEBUG_DEFINES = DISABLE_THREAD_CHECK;
DEBUG_DEFINES = "DISABLE_THREAD_CHECK ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM";
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders";
OTHER_LDFLAGS = (
......@@ -1569,7 +1571,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
buildSettings = {
DEBUG_DEFINES = NDEBUG;
DEBUG_DEFINES = "NDEBUG ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM";
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders";
OTHER_LDFLAGS = (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment