From 1d9dbcd6a646bfab057f3a3890a212a3d805aac1 Mon Sep 17 00:00:00 2001 From: Stuart Connolly Date: Fri, 17 Jan 2014 09:05:02 +0000 Subject: Fix building on 10.7 --- sequel-pro.xcodeproj/project.pbxproj | 49 +++++++++++------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) (limited to 'sequel-pro.xcodeproj/project.pbxproj') diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index fe67b6fa..e9818298 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -3681,14 +3681,12 @@ 380F4EDB0FC0B50600B0BFD7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Sequel Pro.app/Contents/MacOS/Sequel Pro"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_LIBRARY_DIR)/Frameworks", "\"$(SRCROOT)/Frameworks\"", - "\"$(SRCROOT)\"", ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -3714,14 +3712,12 @@ 380F4EDC0FC0B50600B0BFD7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_LIBRARY_DIR)/Frameworks", "\"$(SRCROOT)/Frameworks\"", - "\"$(SRCROOT)\"", ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; @@ -3746,12 +3742,10 @@ 380F4EDD0FC0B50600B0BFD7 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_LIBRARY_DIR)/Frameworks", "\"$(SRCROOT)/Frameworks\"", - "\"$(SRCROOT)\"", ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; @@ -3775,7 +3769,6 @@ 584754C4120A04560057631F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -3792,7 +3785,6 @@ 584754C5120A04560057631F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -3810,7 +3802,6 @@ 584754C6120A04560057631F /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -3825,6 +3816,7 @@ 588593F00F7AEB6900ED0E67 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; CLANG_WARN_BOOL_CONVERSION = YES; @@ -3875,13 +3867,11 @@ 588593F10F7AEB6900ED0E67 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( - "\"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Distribution\"", - "\"$(SRCROOT)/Frameworks/QueryKit/build/Distribution\"", - "\"$(SRCROOT)/Frameworks\"", - "\"$(SRCROOT)\"", + "$(SRCROOT)/Frameworks/SPMySQLFramework/build/Distribution", + "$(SRCROOT)/Frameworks/QueryKit/build/Distribution", + "$(SRCROOT)/Frameworks", ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -3889,7 +3879,7 @@ GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; INFOPLIST_FILE = Resources/Plists/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/zlib\""; + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks/zlib"; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_LDFLAGS = ( "$(SRCROOT)/Frameworks/zlib/libz.a", @@ -3904,7 +3894,6 @@ 58B906E811BD989A000826E5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; @@ -3923,7 +3912,6 @@ 58B906E911BD989A000826E5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -3943,7 +3931,6 @@ 58B906EA11BD989A000826E5 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3960,7 +3947,6 @@ 58B9096311C3A42C000826E5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; @@ -3980,7 +3966,6 @@ 58B9096411C3A42C000826E5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; @@ -4001,7 +3986,6 @@ 58B9096511C3A42C000826E5 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; @@ -4019,7 +4003,6 @@ 58CDB3380FCE13CB00F8ACA3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(BUILD_DIR)/Debug/**"; GCC_DYNAMIC_NO_PIC = NO; @@ -4040,7 +4023,6 @@ 58CDB3390FCE13CB00F8ACA3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = "$(BUILD_DIR)/Release/**"; @@ -4062,7 +4044,6 @@ 58CDB33A0FCE13CB00F8ACA3 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; FRAMEWORK_SEARCH_PATHS = "$(BUILD_DIR)/Distribution/**"; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -4081,20 +4062,19 @@ C05733C808A9546B00998B17 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( - "\"$(SRCROOT)/Frameworks\"", - "\"$(SRCROOT)\"", + "$(SRCROOT)/Frameworks", + "$(SRCROOT)/Frameworks/SPMySQLFramework/build/Debug", + "$(SRCROOT)/Frameworks/QueryKit/build/Debug", ); GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Resources/Plists/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/zlib\""; + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks/zlib"; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_LDFLAGS = ( "$(SRCROOT)/Frameworks/zlib/libz.a", @@ -4109,21 +4089,20 @@ C05733C908A9546B00998B17 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( - "\"$(SRCROOT)/Frameworks\"", - "\"$(SRCROOT)\"", + "$(SRCROOT)/Frameworks", + "$(SRCROOT)/Frameworks/SPMySQLFramework/build/Release", + "$(SRCROOT)/Frameworks/QueryKit/build/Debug", ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Resources/Plists/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/zlib\""; + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks/zlib"; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_LDFLAGS = ( "$(SRCROOT)/Frameworks/zlib/libz.a", @@ -4138,6 +4117,7 @@ C05733CC08A9546B00998B17 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; CLANG_WARN_BOOL_CONVERSION = YES; @@ -4196,6 +4176,7 @@ C05733CD08A9546B00998B17 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; CLANG_WARN_BOOL_CONVERSION = YES; -- cgit v1.2.3