From d68c37dddc26310778170a242009d4782cc38ce4 Mon Sep 17 00:00:00 2001 From: Stuart Connolly Date: Fri, 30 May 2014 23:27:41 +0100 Subject: Fix tests not running. --- sequel-pro.xcodeproj/project.pbxproj | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 4cac228c..b27e670c 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -3658,8 +3658,8 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( + "$(SRCROOT)/Frameworks", "$(DEVELOPER_LIBRARY_DIR)/Frameworks", - "\"$(SRCROOT)/Frameworks\"", ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -3669,6 +3669,7 @@ GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; INFOPLIST_FILE = "Resources/Plists/Unit Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LD_RUNPATH_SEARCH_PATHS = "$(SRCROOT)/Frameworks"; OTHER_LDFLAGS = ( "-framework", Cocoa, @@ -3686,12 +3687,12 @@ 380F4EDC0FC0B50600B0BFD7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Sequel Pro.app/Contents/MacOS/Sequel Pro"; COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( + "$(SRCROOT)/Frameworks", "$(DEVELOPER_LIBRARY_DIR)/Frameworks", - "\"$(SRCROOT)/Frameworks\"", ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; @@ -3699,6 +3700,7 @@ GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; INFOPLIST_FILE = "Resources/Plists/Unit Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LD_RUNPATH_SEARCH_PATHS = "$(SRCROOT)/Frameworks"; OTHER_LDFLAGS = ( "-framework", Cocoa, @@ -3716,10 +3718,11 @@ 380F4EDD0FC0B50600B0BFD7 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Sequel Pro.app/Contents/MacOS/Sequel Pro"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( + "$(SRCROOT)/Frameworks", "$(DEVELOPER_LIBRARY_DIR)/Frameworks", - "\"$(SRCROOT)/Frameworks\"", ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; @@ -3727,6 +3730,7 @@ GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; INFOPLIST_FILE = "Resources/Plists/Unit Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LD_RUNPATH_SEARCH_PATHS = "$(SRCROOT)/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, -- cgit v1.2.3