From 0b966e901465d83d6dee5621e30390bfac89a507 Mon Sep 17 00:00:00 2001 From: Chris Moeller Date: Mon, 30 Sep 2013 04:09:11 -0700 Subject: [PATCH] Whoops, fixed installation directories so the frameworks load properly when bundled --- .../HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj | 2 ++ .../HighlyExperimental.xcodeproj/project.pbxproj | 2 ++ .../HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj | 2 ++ .../HighlyTheoretical.xcodeproj/project.pbxproj | 2 ++ Frameworks/psflib/psflib.xcodeproj/project.pbxproj | 4 ++++ 5 files changed, 12 insertions(+) diff --git a/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj b/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj index 27fea585b..74df59ed7 100644 --- a/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj @@ -380,6 +380,7 @@ "$(inherited)", ); INFOPLIST_FILE = "HighlyAdvanced/HighlyAdvanced-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx10.6; WRAPPER_EXTENSION = framework; @@ -401,6 +402,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = EMU_COMPILE; INFOPLIST_FILE = "HighlyAdvanced/HighlyAdvanced-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx10.6; WRAPPER_EXTENSION = framework; diff --git a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj index 1c9508435..56c522352 100644 --- a/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj @@ -328,6 +328,7 @@ HAVE_STDINT_H, ); INFOPLIST_FILE = "HighlyExperimental/HighlyExperimental-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx10.6; @@ -355,6 +356,7 @@ EMU_COMPILE, ); INFOPLIST_FILE = "HighlyExperimental/HighlyExperimental-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx10.6; diff --git a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj index 7cfa9f295..0726dcdb8 100644 --- a/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj @@ -291,6 +291,7 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; INFOPLIST_FILE = "HighlyQuixotic/HighlyQuixotic-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = framework; }; @@ -305,6 +306,7 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; INFOPLIST_FILE = "HighlyQuixotic/HighlyQuixotic-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = framework; }; diff --git a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj index 5987f8274..f68f07eba 100644 --- a/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj +++ b/Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj @@ -338,6 +338,7 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; INFOPLIST_FILE = "HighlyTheoretical/HighlyTheoretical-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx10.6; @@ -358,6 +359,7 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; INFOPLIST_FILE = "HighlyTheoretical/HighlyTheoretical-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx10.6; diff --git a/Frameworks/psflib/psflib.xcodeproj/project.pbxproj b/Frameworks/psflib/psflib.xcodeproj/project.pbxproj index 36d3ff8cd..ee6a772b1 100644 --- a/Frameworks/psflib/psflib.xcodeproj/project.pbxproj +++ b/Frameworks/psflib/psflib.xcodeproj/project.pbxproj @@ -258,12 +258,14 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; INFOPLIST_FILE = "psflib/psflib-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx10.6; @@ -278,12 +280,14 @@ i386, ppc, ); + CLANG_ENABLE_OBJC_ARC = NO; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; INFOPLIST_FILE = "psflib/psflib-Info.plist"; + INSTALL_PATH = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx10.6;