From dae84c4a2e1476df66a80f3ffeecb629451e4c14 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Mon, 25 Apr 2016 11:13:16 -0400 Subject: [PATCH] Manually fix hardcoded absolute paths, silly Xcode. --- External/Pearl | 2 +- .../project.pbxproj | 18 ++++++------------ .../project.pbxproj | 3 --- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/External/Pearl b/External/Pearl index db613dce..790dc7a9 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit db613dce0a2a7ac83c866e9d0578038d45ec0c31 +Subproject commit 790dc7a9a1a5e84320589c4fa7bcd9ad1d74bbd1 diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj index 6e68ce90..d7e74926 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj @@ -2569,7 +2569,7 @@ COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - /Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Mac, + "\"$(SRCROOT)/../../../External/Mac\"", ); GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch"; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2577,7 +2577,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", + "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac; PROVISIONING_PROFILE = ""; @@ -2598,7 +2598,7 @@ COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - /Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Mac, + "\"$(SRCROOT)/../../../External/Mac\"", ); GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch"; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2606,7 +2606,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", + "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac; PROVISIONING_PROFILE = ""; @@ -2753,7 +2753,7 @@ COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - /Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Mac, + "\"$(SRCROOT)/../../../External/Mac\"", ); GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch"; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2761,7 +2761,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", + "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac; PROVISIONING_PROFILE = ""; @@ -2779,9 +2779,7 @@ GCC_PREFIX_HEADER = "../Pearl/Pearl-Prefix.pch"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto\"", "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", - "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2861,9 +2859,7 @@ GCC_PREFIX_HEADER = "../Pearl/Pearl-Prefix.pch"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto\"", "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", - "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2880,9 +2876,7 @@ GCC_PREFIX_HEADER = "../Pearl/Pearl-Prefix.pch"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto\"", "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", - "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj index 9fffa646..f4bff900 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -4225,7 +4225,6 @@ LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", "$(inherited)", - "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -4325,7 +4324,6 @@ LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", "$(inherited)", - "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -4341,7 +4339,6 @@ LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", "$(inherited)", - "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib", ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES;