Reviewed by Mark Rowe.
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Feb 2008 20:57:38 +0000 (20:57 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Feb 2008 20:57:38 +0000 (20:57 +0000)
        <rdar://problem/5722972> Leopard needs to statically link SQLite

        * Configurations/Base.xcconfig: Always have a header search path for WebCoreSQLite3.
        * Configurations/DebugRelease.xcconfig: Ditto.
        * Configurations/WebCore.xcconfig: Always link against WebCoreSQLite3.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29973 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/Configurations/Base.xcconfig
WebCore/Configurations/DebugRelease.xcconfig
WebCore/Configurations/WebCore.xcconfig

index b112f31..eab5bad 100644 (file)
@@ -1,3 +1,13 @@
+2008-02-04  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        <rdar://problem/5722972> Leopard needs to statically link SQLite
+
+        * Configurations/Base.xcconfig: Always have a header search path for WebCoreSQLite3.
+        * Configurations/DebugRelease.xcconfig: Ditto.
+        * Configurations/WebCore.xcconfig: Always link against WebCoreSQLite3.
+
 2008-02-04  Adam Roben  <aroben@apple.com>
 
         Windows build fix
index dc81b0a..1f82674 100644 (file)
@@ -29,12 +29,8 @@ WARNING_CFLAGS_ppc = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
 WARNING_CFLAGS_ppc64 = $(WARNING_CFLAGS_BASE);
 WARNING_CFLAGS_x86_64 = $(WARNING_CFLAGS_BASE);
 
-// These will be overriden in Debug and Release on Tiger 10.4 by DebugRelease.xcconfig.
-SQLITE3_HEADER_SEARCH_PATHS = $(SQLITE3_HEADER_SEARCH_PATHS_$(MAC_OS_X_VERSION_MAJOR));
-SQLITE3_HEADER_SEARCH_PATHS_ = $(NEXT_ROOT)/usr/local/include/WebCoreSQLite3;
-SQLITE3_HEADER_SEARCH_PATHS_1040 = $(NEXT_ROOT)/usr/local/include/WebCoreSQLite3;
-SQLITE3_HEADER_SEARCH_PATHS_1050 = ;
-
+// This will be overriden in Debug and Release configurations by DebugRelease.xcconfig.
+SQLITE3_HEADER_SEARCH_PATHS = $(NEXT_ROOT)/usr/local/include/WebCoreSQLite3;
 
 // <rdar://problem/5488678>: Production builds on 10.4 PowerPC need to have debugging symbols disabled to prevent a huge STABS section being generated.
 //                           Xcode on 10.4 does not define MAC_OS_X_VERSION_MAJOR, so the default Mac OS X version is treated as 10.4.
index 2ab3180..177c882 100644 (file)
@@ -4,5 +4,4 @@ MACOSX_DEPLOYMENT_TARGET_ = 10.4;
 MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
 MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
 
-SQLITE3_HEADER_SEARCH_PATHS_ = $(BUILT_PRODUCTS_DIR)/WebCoreSQLite3;
-SQLITE3_HEADER_SEARCH_PATHS_1040 = $(BUILT_PRODUCTS_DIR)/WebCoreSQLite3;
+SQLITE3_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCoreSQLite3;
index 6b141d9..d6b0505 100644 (file)
@@ -13,10 +13,4 @@ HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/li
 INFOPLIST_FILE = Info.plist;
 INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
 PRODUCT_NAME = WebCore;
-
-SQLITE3_LIBRARY = $(SQLITE3_LIBRARY_$(MAC_OS_X_VERSION_MAJOR));
-SQLITE3_LIBRARY_ = WebCoreSQLite3;
-SQLITE3_LIBRARY_1040 = WebCoreSQLite3;
-SQLITE3_LIBRARY_1050 = sqlite3;
-
-OTHER_LDFLAGS = -l$(SQLITE3_LIBRARY) -lobjc -sub_library libobjc -umbrella WebKit;
+OTHER_LDFLAGS = -lWebCoreSQLite3 -lobjc -sub_library libobjc -umbrella WebKit;