--- MacSword.xcodeproj/project.pbxproj.orig 2008-08-03 23:46:17.000000000 +1000 +++ MacSword.xcodeproj/project.pbxproj 2009-02-21 21:29:47.000000000 +1100 @@ -458,7 +458,7 @@ 500C8BBE09B12C1200B25530 /* Personal */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Personal; path = Resources/Personal; sourceTree = ""; }; 502419D509996053006816E2 /* German */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = German; path = German.lproj/MainMenu.nib; sourceTree = ""; }; 50EAB1DB09B007AD00E61DE6 /* AGRegex.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGRegex.framework; path = AGRegex/build/Deployment/AGRegex.framework; sourceTree = SOURCE_ROOT; }; - 50EAB1E309B007EA00E61DE6 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = sword_mac_build/build/result_inst/locales.d; sourceTree = ""; }; + 50EAB1E309B007EA00E61DE6 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = __PREFIX/share/sword/locales.d; sourceTree = ""; }; 8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D15AC370486D014006FF6A4 /* MacSword.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacSword.app; sourceTree = BUILT_PRODUCTS_DIR; }; A90FD2660DFE85950025F137 /* Finnish */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Finnish; path = Finnish.lproj/Localizable.strings; sourceTree = ""; }; @@ -644,7 +644,7 @@ A92AD37F0D4BEC6700AE84EE /* zstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zstr.h; sourceTree = ""; }; A92AD3800D4BEC6700AE84EE /* ztext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ztext.h; sourceTree = ""; }; A92AD3810D4BEC6700AE84EE /* zverse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zverse.h; sourceTree = ""; }; - A92AD41B0D4BED2500AE84EE /* libsword-1.5.11-fat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsword-1.5.11-fat.a"; path = "sword_mac_build/build/result_inst/lib/libsword-1.5.11-fat.a"; sourceTree = ""; }; + A92AD41B0D4BED2500AE84EE /* libsword-1.5.11-fat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsword.a"; path = "__PREFIX/lib/libsword.a"; sourceTree = ""; }; A92D940F0C0F4CD000F8C7BF /* BibleIndexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BibleIndexer.h; path = src/Indexing/BibleIndexer.h; sourceTree = ""; }; A92D94100C0F4CD000F8C7BF /* BibleIndexer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BibleIndexer.m; path = src/Indexing/BibleIndexer.m; sourceTree = ""; }; A92D941B0C0F506400F8C7BF /* BookIndexer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BookIndexer.h; path = src/Indexing/BookIndexer.h; sourceTree = ""; }; @@ -1580,7 +1580,7 @@ A99C2A850B34525900805DEF /* PBXTargetDependency */, ); name = MacSword; - productInstallPath = "$(HOME)/Applications"; + productInstallPath = "__APPS_DIR"; productName = MacSword; productReference = 8D15AC370486D014006FF6A4 /* MacSword.app */; productType = "com.apple.product-type.application"; @@ -1929,10 +1929,11 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**"; + HEADER_SEARCH_PATHS = ("__PREFIX/include/sword", "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**",); INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; + INSTALL_PATH = "__APPS_DIR"; LIBRARY_SEARCH_PATHS = ( + "__PREFIX/lib", "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", @@ -1948,7 +1949,6 @@ "-lcurl", ); PRODUCT_NAME = MacSword; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SECTORDER_FLAGS = ""; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**"; WARNING_CFLAGS = "-Wall"; @@ -1960,10 +1960,7 @@ 3DEB87B108C794D100C58D39 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(SRCROOT)/AGRegex/build/Deployment", @@ -1988,10 +1985,11 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**"; + HEADER_SEARCH_PATHS = ("__PREFIX/include/sword", "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**",); INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; + INSTALL_PATH = "__APPS_DIR"; LIBRARY_SEARCH_PATHS = ( + "__PREFIX/lib", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -2006,7 +2004,6 @@ "-lcurl", ); PRODUCT_NAME = MacSword; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SECTORDER_FLAGS = ""; STRIP_INSTALLED_PRODUCT = YES; WARNING_CFLAGS = "-Wall"; @@ -2034,10 +2031,11 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = /Users/william/sword/include; + HEADER_SEARCH_PATHS = __PREFIX/include/sword; INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; + INSTALL_PATH = "__APPS_DIR"; LIBRARY_SEARCH_PATHS = ( + "__PREFIX/lib", /Users/william/Documents/cvs/macsword, "$(SRCROOT)/sword-mac-build/fat_inst/lib", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", @@ -2072,7 +2070,6 @@ isa = XCBuildConfiguration; buildSettings = { MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Development; }; @@ -2080,7 +2077,6 @@ isa = XCBuildConfiguration; buildSettings = { MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; }; @@ -2088,7 +2084,6 @@ isa = XCBuildConfiguration; buildSettings = { MACOSX_DEPLOYMENT_TARGET = 10.2; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Default; };