use @rpath for OS X Shared Library as well
authorEdward Rudd <urkle@outoforder.cc>
Thu, 08 Aug 2013 11:41:35 -0400
changeset 7604aed5e6b271f3
parent 7603 96b76c2ce46a
child 7605 7a47881c2800
use @rpath for OS X Shared Library as well
Xcode/SDL/SDL.xcodeproj/project.pbxproj
Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
     1.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Thu Aug 08 09:47:42 2013 -0300
     1.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Thu Aug 08 11:41:35 2013 -0400
     1.3 @@ -2798,7 +2798,7 @@
     1.4  				);
     1.5  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
     1.6  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
     1.7 -				INSTALL_PATH = "@loader_path";
     1.8 +				INSTALL_PATH = "@rpath";
     1.9  				PRODUCT_NAME = SDL2;
    1.10  				SKIP_INSTALL = YES;
    1.11  			};
    1.12 @@ -2817,7 +2817,7 @@
    1.13  				);
    1.14  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    1.15  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
    1.16 -				INSTALL_PATH = "@loader_path";
    1.17 +				INSTALL_PATH = "@rpath";
    1.18  				PRODUCT_NAME = SDL2;
    1.19  				SKIP_INSTALL = YES;
    1.20  			};
     2.1 --- a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj	Thu Aug 08 09:47:42 2013 -0300
     2.2 +++ b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj	Thu Aug 08 11:41:35 2013 -0400
     2.3 @@ -780,20 +780,6 @@
     2.4  			remoteGlobalIDString = BECDF6BE0761BA81005FE872;
     2.5  			remoteInfo = "Standard DMG";
     2.6  		};
     2.7 -		003FA64A093FFD41000C53B3 /* PBXContainerItemProxy */ = {
     2.8 -			isa = PBXContainerItemProxy;
     2.9 -			containerPortal = 003FA63A093FFD41000C53B3 /* SDL.xcodeproj */;
    2.10 -			proxyType = 2;
    2.11 -			remoteGlobalIDString = BECDF6C30761BA81005FE872;
    2.12 -			remoteInfo = "Devel Extras Package";
    2.13 -		};
    2.14 -		4537747F120914AE002F0F45 /* PBXContainerItemProxy */ = {
    2.15 -			isa = PBXContainerItemProxy;
    2.16 -			containerPortal = 003FA63A093FFD41000C53B3 /* SDL.xcodeproj */;
    2.17 -			proxyType = 2;
    2.18 -			remoteGlobalIDString = 00D8D9EF1195090700638393;
    2.19 -			remoteInfo = testsdl;
    2.20 -		};
    2.21  		DB166D6D16A1CEAA00A1396C /* PBXContainerItemProxy */ = {
    2.22  			isa = PBXContainerItemProxy;
    2.23  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
    2.24 @@ -878,6 +864,13 @@
    2.25  			remoteGlobalIDString = DB166E8016A1D78C00A1396C;
    2.26  			remoteInfo = teststreaming;
    2.27  		};
    2.28 +		DB1D40D617B3F30D00D74CFC /* PBXContainerItemProxy */ = {
    2.29 +			isa = PBXContainerItemProxy;
    2.30 +			containerPortal = 003FA63A093FFD41000C53B3 /* SDL.xcodeproj */;
    2.31 +			proxyType = 2;
    2.32 +			remoteGlobalIDString = DB31407717554B71006C0E22;
    2.33 +			remoteInfo = "Shared Library";
    2.34 +		};
    2.35  /* End PBXContainerItemProxy section */
    2.36  
    2.37  /* Begin PBXCopyFilesBuildPhase section */
    2.38 @@ -991,13 +984,13 @@
    2.39  		0017958F1074216E00F5D044 /* testatomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testatomic.c; path = ../../test/testatomic.c; sourceTree = SOURCE_ROOT; };
    2.40  		001795AD107421BF00F5D044 /* testaudioinfo */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testaudioinfo; sourceTree = BUILT_PRODUCTS_DIR; };
    2.41  		001795B01074222D00F5D044 /* testaudioinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testaudioinfo.c; path = ../../test/testaudioinfo.c; sourceTree = SOURCE_ROOT; };
    2.42 -		0017972110742F3200F5D044 /* testgl2 */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testgl2; sourceTree = BUILT_PRODUCTS_DIR; };
    2.43 +		0017972110742F3200F5D044 /* testgl2 */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testgl2; sourceTree = BUILT_PRODUCTS_DIR; };
    2.44  		0017972710742FB900F5D044 /* testgl2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testgl2.c; path = ../../test/testgl2.c; sourceTree = SOURCE_ROOT; };
    2.45 -		00179748107430D600F5D044 /* testhaptic */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testhaptic; sourceTree = BUILT_PRODUCTS_DIR; };
    2.46 +		00179748107430D600F5D044 /* testhaptic */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testhaptic; sourceTree = BUILT_PRODUCTS_DIR; };
    2.47  		0017974E1074315700F5D044 /* testhaptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testhaptic.c; path = ../../test/testhaptic.c; sourceTree = SOURCE_ROOT; };
    2.48  		0017976E107431B300F5D044 /* testdraw2 */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testdraw2; sourceTree = BUILT_PRODUCTS_DIR; };
    2.49  		001797711074320D00F5D044 /* testdraw2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testdraw2.c; path = ../../test/testdraw2.c; sourceTree = SOURCE_ROOT; };
    2.50 -		0017978E107432AE00F5D044 /* testime */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testime; sourceTree = BUILT_PRODUCTS_DIR; };
    2.51 +		0017978E107432AE00F5D044 /* testime */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testime; sourceTree = BUILT_PRODUCTS_DIR; };
    2.52  		00179791107432FA00F5D044 /* testime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testime.c; path = ../../test/testime.c; sourceTree = SOURCE_ROOT; };
    2.53  		001797AE1074334C00F5D044 /* testintersections */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testintersections; sourceTree = BUILT_PRODUCTS_DIR; };
    2.54  		001797B31074339C00F5D044 /* testintersections.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testintersections.c; path = ../../test/testintersections.c; sourceTree = SOURCE_ROOT; };
    2.55 @@ -1056,13 +1049,13 @@
    2.56  		4537749212091504002F0F45 /* testshape */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testshape; sourceTree = BUILT_PRODUCTS_DIR; };
    2.57  		453774A4120915E3002F0F45 /* testshape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testshape.c; path = ../../test/testshape.c; sourceTree = SOURCE_ROOT; };
    2.58  		BBFC088E164C6820003E6A99 /* testgamecontroller.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testgamecontroller.c; path = ../../test/testgamecontroller.c; sourceTree = "<group>"; };
    2.59 -		BBFC08CD164C6862003E6A99 /* testgamecontroller */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testgamecontroller; sourceTree = BUILT_PRODUCTS_DIR; };
    2.60 -		BEC566B60761D90300A33029 /* checkkeys */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = checkkeys; sourceTree = BUILT_PRODUCTS_DIR; };
    2.61 +		BBFC08CD164C6862003E6A99 /* testgamecontroller */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testgamecontroller; sourceTree = BUILT_PRODUCTS_DIR; };
    2.62 +		BEC566B60761D90300A33029 /* checkkeys */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = checkkeys; sourceTree = BUILT_PRODUCTS_DIR; };
    2.63  		BEC566D10761D90300A33029 /* loopwave */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = loopwave; sourceTree = BUILT_PRODUCTS_DIR; };
    2.64  		BEC567060761D90400A33029 /* testerror */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testerror; sourceTree = BUILT_PRODUCTS_DIR; };
    2.65  		BEC5672E0761D90400A33029 /* testthread */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testthread; sourceTree = BUILT_PRODUCTS_DIR; };
    2.66 -		BEC5673B0761D90400A33029 /* testjoystick */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testjoystick; sourceTree = BUILT_PRODUCTS_DIR; };
    2.67 -		BEC567480761D90400A33029 /* testkeys */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testkeys; sourceTree = BUILT_PRODUCTS_DIR; };
    2.68 +		BEC5673B0761D90400A33029 /* testjoystick */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testjoystick; sourceTree = BUILT_PRODUCTS_DIR; };
    2.69 +		BEC567480761D90400A33029 /* testkeys */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testkeys; sourceTree = BUILT_PRODUCTS_DIR; };
    2.70  		BEC567550761D90400A33029 /* testlock */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testlock; sourceTree = BUILT_PRODUCTS_DIR; };
    2.71  		BEC5677D0761D90500A33029 /* testsem */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testsem; sourceTree = BUILT_PRODUCTS_DIR; };
    2.72  		BEC567980761D90500A33029 /* testtimer */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testtimer; sourceTree = BUILT_PRODUCTS_DIR; };
    2.73 @@ -1848,9 +1841,8 @@
    2.74  			children = (
    2.75  				003FA643093FFD41000C53B3 /* SDL2.framework */,
    2.76  				003FA645093FFD41000C53B3 /* libSDL2.a */,
    2.77 +				DB1D40D717B3F30D00D74CFC /* libSDL2.dylib */,
    2.78  				003FA649093FFD41000C53B3 /* Standard DMG */,
    2.79 -				003FA64B093FFD41000C53B3 /* Developer Extras Package */,
    2.80 -				45377480120914AE002F0F45 /* testsdl.app */,
    2.81  			);
    2.82  			name = Products;
    2.83  			sourceTree = "<group>";
    2.84 @@ -2800,18 +2792,11 @@
    2.85  			remoteRef = 003FA648093FFD41000C53B3 /* PBXContainerItemProxy */;
    2.86  			sourceTree = BUILT_PRODUCTS_DIR;
    2.87  		};
    2.88 -		003FA64B093FFD41000C53B3 /* Developer Extras Package */ = {
    2.89 +		DB1D40D717B3F30D00D74CFC /* libSDL2.dylib */ = {
    2.90  			isa = PBXReferenceProxy;
    2.91 -			fileType = "compiled.mach-o.executable";
    2.92 -			path = "Developer Extras Package";
    2.93 -			remoteRef = 003FA64A093FFD41000C53B3 /* PBXContainerItemProxy */;
    2.94 -			sourceTree = BUILT_PRODUCTS_DIR;
    2.95 -		};
    2.96 -		45377480120914AE002F0F45 /* testsdl.app */ = {
    2.97 -			isa = PBXReferenceProxy;
    2.98 -			fileType = wrapper.application;
    2.99 -			path = testsdl.app;
   2.100 -			remoteRef = 4537747F120914AE002F0F45 /* PBXContainerItemProxy */;
   2.101 +			fileType = "compiled.mach-o.dylib";
   2.102 +			path = libSDL2.dylib;
   2.103 +			remoteRef = DB1D40D617B3F30D00D74CFC /* PBXContainerItemProxy */;
   2.104  			sourceTree = BUILT_PRODUCTS_DIR;
   2.105  		};
   2.106  /* End PBXReferenceProxy section */
   2.107 @@ -4323,6 +4308,7 @@
   2.108  				DB166D8216A1D12400A1396C /* Release */,
   2.109  			);
   2.110  			defaultConfigurationIsVisible = 0;
   2.111 +			defaultConfigurationName = Debug;
   2.112  		};
   2.113  		DB166DBC16A1D2F600A1396C /* Build configuration list for PBXNativeTarget "testgesture" */ = {
   2.114  			isa = XCConfigurationList;