+2007-11-16 Mark Rowe <mrowe@apple.com>
+
+ Reviewed by Tim Hatcher.
+
+ Build WebCore as a sub-framework of WebKit in all configurations.
+
+ * Configurations/WebCore.xcconfig:
+ * WebCore.xcodeproj/project.pbxproj:
+
2007-11-16 Doug Turner <dougt@meer.net>
Reviewed by Alp.
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
PRODUCT_NAME = WebCore;
+OTHER_LDFLAGS = -lobjc -sub_library libobjc -umbrella WebKit;
buildSettings = {
DEBUG_DEFINES = DISABLE_THREAD_CHECK;
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
- OTHER_LDFLAGS = (
- "-lobjc",
- "-sub_library",
- libobjc,
- );
};
name = Debug;
};
buildSettings = {
DEBUG_DEFINES = NDEBUG;
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
- OTHER_LDFLAGS = (
- "-lobjc",
- "-sub_library",
- libobjc,
- );
};
name = Release;
};
baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
buildSettings = {
DEBUG_DEFINES = NDEBUG;
- OTHER_LDFLAGS = (
- "-lobjc",
- "-sub_library",
- libobjc,
- "-umbrella",
- WebKit,
- );
SECTORDER_FLAGS = (
"-sectorder",
__TEXT,
+2007-11-16 Mark Rowe <mrowe@apple.com>
+
+ Reviewed by Tim Hatcher.
+
+ Build WebCore as a sub-framework of WebKit in all configurations.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2007-11-16 Brady Eidson <beidson@apple.com>
* WebKit.xcodeproj/project.pbxproj: WebDatabaseManagerPrivate.h, also!
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders";
OTHER_LDFLAGS = (
- "-lobjc",
- "-sub_library",
- libobjc,
+ "$(OTHER_LDFLAGS)",
"-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
);
UMBRELLA_FRAMEWORKS_DIR = "$(BUILT_PRODUCTS_DIR)";
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders";
OTHER_LDFLAGS = (
- "-lobjc",
- "-sub_library",
- libobjc,
+ "$(OTHER_LDFLAGS)",
"-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
);
UMBRELLA_FRAMEWORKS_DIR = "$(BUILT_PRODUCTS_DIR)";
buildSettings = {
DEBUG_DEFINES = NDEBUG;
OTHER_LDFLAGS = (
- "-sub_umbrella",
- WebCore,
+ "$(OTHER_LDFLAGS)",
"-lWebKitSystemInterface",
);
SECTORDER_FLAGS = (
+2007-11-16 Mark Rowe <mrowe@apple.com>
+
+ Reviewed by Tim Hatcher.
+
+ Build WebCore as a sub-framework of WebKit in all configurations.
+
+ * Configurations/WebKit.xcconfig:
+
2007-11-16 John Sullivan <sullivan@apple.com>
Reviewed by Brady
PRODUCT_NAME = WebKit;
UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+OTHER_LDFLAGS = -sub_umbrella WebCore $(OTHER_LDFLAGS);
+2007-11-16 Mark Rowe <mrowe@apple.com>
+
+ Reviewed by Tim Hatcher.
+
+ Don't weak link against WebCore now that it is a sub-framework of WebKit in all configurations.
+
+ * Drosera/mac/Drosera.xcodeproj/project.pbxproj:
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+
2007-11-15 Adam Roben <aroben@apple.com>
Make run-safari actually work on Windows
GCC_PREFIX_HEADER = "";
HEADER_SEARCH_PATHS = ../ForwardingHeaders;
INFOPLIST_FILE = Info.plist;
- OTHER_LDFLAGS = (
- "-weak_framework",
- JavaScriptCore,
- "-weak_framework",
- WebCore,
- );
PRODUCT_NAME = Drosera;
USER_HEADER_SEARCH_PATHS = ../ForwardingHeaders/;
VALID_ARCHS = "ppc7400 ppc970 i386 ppc";
GCC_PREFIX_HEADER = "";
HEADER_SEARCH_PATHS = ../ForwardingHeaders;
INFOPLIST_FILE = Info.plist;
- OTHER_LDFLAGS = (
- "-weak_framework",
- JavaScriptCore,
- "-weak_framework",
- WebCore,
- );
PRODUCT_NAME = Drosera;
USER_HEADER_SEARCH_PATHS = ../ForwardingHeaders/;
VALID_ARCHS = "ppc7400 ppc970 i386 ppc";
LIBRARY_STYLE = BUNDLE;
OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
- OTHER_LDFLAGS = (
- "-framework",
- Carbon,
- "-weak_framework",
- WebCore,
- );
OTHER_REZFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = TestNetscapePlugIn;
LIBRARY_STYLE = BUNDLE;
OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
- OTHER_LDFLAGS = (
- "-framework",
- Carbon,
- "-weak_framework",
- WebCore,
- );
OTHER_REZFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = TestNetscapePlugIn;
__DATA,
Ahem,
"qt/fonts/AHEM____.TTF",
- "-weak_framework",
- WebCore,
);
PRODUCT_NAME = DumpRenderTree;
VALID_ARCHS = "ppc7400 ppc970 i386 ppc";
__DATA,
Ahem,
"qt/fonts/AHEM____.TTF",
- "-weak_framework",
- WebCore,
);
PRODUCT_NAME = DumpRenderTree;
VALID_ARCHS = "ppc7400 ppc970 i386 ppc";
MACOSX_DEPLOYMENT_TARGET_ = 10.4;
MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
- OTHER_LDFLAGS = (
- "-weak_framework",
- WebCore,
- );
PREBINDING = NO;
WARNING_CFLAGS = (
"-Wall",
MACOSX_DEPLOYMENT_TARGET_ = 10.4;
MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
- OTHER_LDFLAGS = (
- "-weak_framework",
- WebCore,
- );
PREBINDING = NO;
WARNING_CFLAGS = (
"-Wall",
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
- OTHER_LDFLAGS = (
- "-weak_framework",
- WebCore,
- );
OTHER_REZFLAGS = "";
PRODUCT_NAME = All;
SECTORDER_FLAGS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
- OTHER_LDFLAGS = (
- "-weak_framework",
- WebCore,
- );
OTHER_REZFLAGS = "";
PRODUCT_NAME = All;
SECTORDER_FLAGS = "";