Skip to content

Commit c7337b2

Browse files
sboothsbooth
committed
Changed install path to @rpath 
1 parent 7171d8a commit c7337b2

File tree

7 files changed

+21
-12
lines changed

7 files changed

+21
-12
lines changed

‎Encoding/AIFF/AIFF.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
GCC_PRECOMPILE_PREFIX_HEADER = YES;
325325
GCC_PREFIX_HEADER = AIFF_Prefix.pch;
326326
INFOPLIST_FILE = Info.plist;
327-
INSTALL_PATH = "@executable_path/../PlugIns";
327+
INSTALL_PATH = "@rpath";
328328
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
329329
PRODUCT_NAME = AIFF;
330330
WRAPPER_EXTENSION = bundle;
@@ -342,7 +342,7 @@
342342
GCC_PRECOMPILE_PREFIX_HEADER = YES;
343343
GCC_PREFIX_HEADER = AIFF_Prefix.pch;
344344
INFOPLIST_FILE = Info.plist;
345-
INSTALL_PATH = "@executable_path/../PlugIns";
345+
INSTALL_PATH = "@rpath";
346346
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
347347
PRODUCT_NAME = AIFF;
348348
WRAPPER_EXTENSION = bundle;

‎Encoding/AppleLossless/AppleLossless.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
GCC_PRECOMPILE_PREFIX_HEADER = YES;
325325
GCC_PREFIX_HEADER = AppleLossless_Prefix.pch;
326326
INFOPLIST_FILE = Info.plist;
327-
INSTALL_PATH = "@executable_path/../PlugIns";
327+
INSTALL_PATH = "@rpath";
328328
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
329329
PRODUCT_NAME = AppleLossless;
330330
WRAPPER_EXTENSION = bundle;
@@ -342,7 +342,7 @@
342342
GCC_PRECOMPILE_PREFIX_HEADER = YES;
343343
GCC_PREFIX_HEADER = AppleLossless_Prefix.pch;
344344
INFOPLIST_FILE = Info.plist;
345-
INSTALL_PATH = "@executable_path/../PlugIns";
345+
INSTALL_PATH = "@rpath";
346346
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
347347
PRODUCT_NAME = AppleLossless;
348348
WRAPPER_EXTENSION = bundle;

‎Encoding/EncoderInterface/EncoderInterface.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
GCC_PRECOMPILE_PREFIX_HEADER = YES;
228228
GCC_PREFIX_HEADER = EncoderInterface_Prefix.pch;
229229
INFOPLIST_FILE = Info.plist;
230-
INSTALL_PATH = "@executable_path/../Frameworks";
230+
INSTALL_PATH = "@rpath";
231231
PRODUCT_NAME = EncoderInterface;
232232
WRAPPER_EXTENSION = framework;
233233
};
@@ -243,7 +243,7 @@
243243
GCC_PRECOMPILE_PREFIX_HEADER = YES;
244244
GCC_PREFIX_HEADER = EncoderInterface_Prefix.pch;
245245
INFOPLIST_FILE = Info.plist;
246-
INSTALL_PATH = "@executable_path/../Frameworks";
246+
INSTALL_PATH = "@rpath";
247247
PRODUCT_NAME = EncoderInterface;
248248
WRAPPER_EXTENSION = framework;
249249
};

‎Encoding/EncoderManager.m

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,17 @@ @implementation EncoderManager
367367

368368
+ (id) sharedEncoderManager
369369
{
370+
#if 0
371+
// Is this necessary? Probably not...
372+
if(!sSharedEncoderManager) {
373+
id possiblySharedInstance = [[self alloc] init];
374+
if(!objc_atomicCompareAndSwapGlobalBarrier(nil, possiblySharedInstance, &sSharedEncoderManager))
375+
possiblySharedInstance = nil;
376+
}
377+
#else
370378
if(!sSharedEncoderManager)
371379
sSharedEncoderManager = [[self alloc] init];
380+
#endif
372381
return sSharedEncoderManager;
373382
}
374383

‎Encoding/FLAC/FLAC.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
GCC_PRECOMPILE_PREFIX_HEADER = YES;
305305
GCC_PREFIX_HEADER = FLAC_Prefix.pch;
306306
INFOPLIST_FILE = Info.plist;
307-
INSTALL_PATH = "@executable_path/../PlugIns";
307+
INSTALL_PATH = "@rpath";
308308
PRODUCT_NAME = FLAC;
309309
WRAPPER_EXTENSION = bundle;
310310
};
@@ -317,7 +317,7 @@
317317
GCC_PRECOMPILE_PREFIX_HEADER = YES;
318318
GCC_PREFIX_HEADER = FLAC_Prefix.pch;
319319
INFOPLIST_FILE = Info.plist;
320-
INSTALL_PATH = "@executable_path/../PlugIns";
320+
INSTALL_PATH = "@rpath";
321321
PRODUCT_NAME = FLAC;
322322
WRAPPER_EXTENSION = bundle;
323323
};

‎Encoding/WAVE/WAVE.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
GCC_PRECOMPILE_PREFIX_HEADER = YES;
324324
GCC_PREFIX_HEADER = WAVE_Prefix.pch;
325325
INFOPLIST_FILE = Info.plist;
326-
INSTALL_PATH = "@executable_path/../PlugIns";
326+
INSTALL_PATH = "@rpath";
327327
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
328328
PRODUCT_NAME = WAVE;
329329
WRAPPER_EXTENSION = bundle;
@@ -341,7 +341,7 @@
341341
GCC_PRECOMPILE_PREFIX_HEADER = YES;
342342
GCC_PREFIX_HEADER = WAVE_Prefix.pch;
343343
INFOPLIST_FILE = Info.plist;
344-
INSTALL_PATH = "@executable_path/../PlugIns";
344+
INSTALL_PATH = "@rpath";
345345
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
346346
PRODUCT_NAME = WAVE;
347347
WRAPPER_EXTENSION = bundle;

‎Encoding/WavPack/WavPack.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
GCC_PRECOMPILE_PREFIX_HEADER = YES;
293293
GCC_PREFIX_HEADER = WavPack_Prefix.pch;
294294
INFOPLIST_FILE = Info.plist;
295-
INSTALL_PATH = "@executable_path/../PlugIns";
295+
INSTALL_PATH = "@rpath";
296296
PRODUCT_NAME = WavPack;
297297
WRAPPER_EXTENSION = bundle;
298298
};
@@ -305,7 +305,7 @@
305305
GCC_PRECOMPILE_PREFIX_HEADER = YES;
306306
GCC_PREFIX_HEADER = WavPack_Prefix.pch;
307307
INFOPLIST_FILE = Info.plist;
308-
INSTALL_PATH = "@executable_path/../PlugIns";
308+
INSTALL_PATH = "@rpath";
309309
PRODUCT_NAME = WavPack;
310310
WRAPPER_EXTENSION = bundle;
311311
};

0 commit comments

Comments
 (0)