[xiph-commits] r3008 - liboggplay/trunk/plugin/mac/liboggplay.xcodeproj

tahn at svn.annodex.net tahn at svn.annodex.net
Wed Jun 20 02:35:01 PDT 2007


Author: tahn
Date: 2007-06-20 02:35:01 -0700 (Wed, 20 Jun 2007)
New Revision: 3008

Modified:
   liboggplay/trunk/plugin/mac/liboggplay.xcodeproj/project.pbxproj
Log:
Sigh... just copying the libraries away from /usr/local/lib isn't enough; Xcode *still* finds and links against their dynamic equivalents.
So now we rename them during the copy.


Modified: liboggplay/trunk/plugin/mac/liboggplay.xcodeproj/project.pbxproj
===================================================================
--- liboggplay/trunk/plugin/mac/liboggplay.xcodeproj/project.pbxproj	2007-06-20 05:49:28 UTC (rev 3007)
+++ liboggplay/trunk/plugin/mac/liboggplay.xcodeproj/project.pbxproj	2007-06-20 09:35:01 UTC (rev 3008)
@@ -18,14 +18,14 @@
 		2C96CCA40C0402280015B6AC /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C96CCA30C0402280015B6AC /* AudioUnit.framework */; };
 		2C96D1330C0666340015B6AC /* sydney_audio_mac.c in Sources */ = {isa = PBXBuildFile; fileRef = 2C96D1320C0666340015B6AC /* sydney_audio_mac.c */; };
 		2CA761D50BF978E10008A3B7 /* std_semaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CA761D40BF978E10008A3B7 /* std_semaphore.h */; };
-		2CC888BB0C28E8A300213FD7 /* libfishsound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CC888B30C28E8A300213FD7 /* libfishsound.a */; };
-		2CC888BC0C28E8A300213FD7 /* liboggz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CC888B40C28E8A300213FD7 /* liboggz.a */; };
-		2CC888BD0C28E8A300213FD7 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CC888B50C28E8A300213FD7 /* libogg.a */; };
-		2CC888BE0C28E8A300213FD7 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CC888B60C28E8A300213FD7 /* libspeex.a */; };
-		2CC888BF0C28E8A300213FD7 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CC888B70C28E8A300213FD7 /* libvorbis.a */; };
-		2CC888C00C28E8A300213FD7 /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CC888B80C28E8A300213FD7 /* libvorbisenc.a */; };
-		2CC888C10C28E8A300213FD7 /* liboggplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CC888B90C28E8A300213FD7 /* liboggplay.a */; };
-		2CC888C20C28E8A300213FD7 /* libtheora.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CC888BA0C28E8A300213FD7 /* libtheora.a */; };
+		2CB42DE60C291F6800DA05E7 /* local_fishsound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CB42DDE0C291F6800DA05E7 /* local_fishsound.a */; };
+		2CB42DE70C291F6800DA05E7 /* local_oggz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CB42DDF0C291F6800DA05E7 /* local_oggz.a */; };
+		2CB42DE80C291F6800DA05E7 /* local_ogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CB42DE00C291F6800DA05E7 /* local_ogg.a */; };
+		2CB42DE90C291F6800DA05E7 /* local_speex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CB42DE10C291F6800DA05E7 /* local_speex.a */; };
+		2CB42DEA0C291F6800DA05E7 /* local_vorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CB42DE20C291F6800DA05E7 /* local_vorbis.a */; };
+		2CB42DEB0C291F6800DA05E7 /* local_vorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CB42DE30C291F6800DA05E7 /* local_vorbisenc.a */; };
+		2CB42DEC0C291F6800DA05E7 /* local_oggplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CB42DE40C291F6800DA05E7 /* local_oggplay.a */; };
+		2CB42DED0C291F6800DA05E7 /* local_theora.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CB42DE50C291F6800DA05E7 /* local_theora.a */; };
 		2CD58C420BD31543001D751D /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2CD58C410BD31543001D751D /* Info.plist */; };
 		2CD58C500BD319C3001D751D /* plugin_gui_mac.c in Sources */ = {isa = PBXBuildFile; fileRef = 2CD58C4A0BD319C3001D751D /* plugin_gui_mac.c */; };
 		2CD58C510BD319C3001D751D /* plugin_gui.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CD58C4B0BD319C3001D751D /* plugin_gui.h */; };
@@ -65,14 +65,14 @@
 		2C96CCA30C0402280015B6AC /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = "<absolute>"; };
 		2C96D1320C0666340015B6AC /* sydney_audio_mac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sydney_audio_mac.c; path = ../audio/sydney_audio_mac.c; sourceTree = SOURCE_ROOT; };
 		2CA761D40BF978E10008A3B7 /* std_semaphore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = std_semaphore.h; path = ../std_semaphore.h; sourceTree = SOURCE_ROOT; };
-		2CC888B30C28E8A300213FD7 /* libfishsound.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfishsound.a; path = libs/libfishsound.a; sourceTree = "<group>"; };
-		2CC888B40C28E8A300213FD7 /* liboggz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboggz.a; path = libs/liboggz.a; sourceTree = "<group>"; };
-		2CC888B50C28E8A300213FD7 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = libs/libogg.a; sourceTree = "<group>"; };
-		2CC888B60C28E8A300213FD7 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = libs/libspeex.a; sourceTree = "<group>"; };
-		2CC888B70C28E8A300213FD7 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = libs/libvorbis.a; sourceTree = "<group>"; };
-		2CC888B80C28E8A300213FD7 /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = libs/libvorbisenc.a; sourceTree = "<group>"; };
-		2CC888B90C28E8A300213FD7 /* liboggplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboggplay.a; path = libs/liboggplay.a; sourceTree = "<group>"; };
-		2CC888BA0C28E8A300213FD7 /* libtheora.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtheora.a; path = libs/libtheora.a; sourceTree = "<group>"; };
+		2CB42DDE0C291F6800DA05E7 /* local_fishsound.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = local_fishsound.a; path = libs/local_fishsound.a; sourceTree = SOURCE_ROOT; };
+		2CB42DDF0C291F6800DA05E7 /* local_oggz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = local_oggz.a; path = libs/local_oggz.a; sourceTree = SOURCE_ROOT; };
+		2CB42DE00C291F6800DA05E7 /* local_ogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = local_ogg.a; path = libs/local_ogg.a; sourceTree = SOURCE_ROOT; };
+		2CB42DE10C291F6800DA05E7 /* local_speex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = local_speex.a; path = libs/local_speex.a; sourceTree = SOURCE_ROOT; };
+		2CB42DE20C291F6800DA05E7 /* local_vorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = local_vorbis.a; path = libs/local_vorbis.a; sourceTree = SOURCE_ROOT; };
+		2CB42DE30C291F6800DA05E7 /* local_vorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = local_vorbisenc.a; path = libs/local_vorbisenc.a; sourceTree = SOURCE_ROOT; };
+		2CB42DE40C291F6800DA05E7 /* local_oggplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = local_oggplay.a; path = libs/local_oggplay.a; sourceTree = SOURCE_ROOT; };
+		2CB42DE50C291F6800DA05E7 /* local_theora.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = local_theora.a; path = libs/local_theora.a; sourceTree = SOURCE_ROOT; };
 		2CD58C410BD31543001D751D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
 		2CD58C4A0BD319C3001D751D /* plugin_gui_mac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = plugin_gui_mac.c; path = ../plugin_gui_mac.c; sourceTree = SOURCE_ROOT; };
 		2CD58C4B0BD319C3001D751D /* plugin_gui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = plugin_gui.h; path = ../plugin_gui.h; sourceTree = SOURCE_ROOT; };
@@ -102,14 +102,14 @@
 				2C83ABCB0BEAC328004C14F4 /* OpenGL.framework in Frameworks */,
 				2C31AFE40BF455CB002C55BF /* Carbon.framework in Frameworks */,
 				2C96CCA40C0402280015B6AC /* AudioUnit.framework in Frameworks */,
-				2CC888BB0C28E8A300213FD7 /* libfishsound.a in Frameworks */,
-				2CC888BC0C28E8A300213FD7 /* liboggz.a in Frameworks */,
-				2CC888BD0C28E8A300213FD7 /* libogg.a in Frameworks */,
-				2CC888BE0C28E8A300213FD7 /* libspeex.a in Frameworks */,
-				2CC888BF0C28E8A300213FD7 /* libvorbis.a in Frameworks */,
-				2CC888C00C28E8A300213FD7 /* libvorbisenc.a in Frameworks */,
-				2CC888C10C28E8A300213FD7 /* liboggplay.a in Frameworks */,
-				2CC888C20C28E8A300213FD7 /* libtheora.a in Frameworks */,
+				2CB42DE60C291F6800DA05E7 /* local_fishsound.a in Frameworks */,
+				2CB42DE70C291F6800DA05E7 /* local_oggz.a in Frameworks */,
+				2CB42DE80C291F6800DA05E7 /* local_ogg.a in Frameworks */,
+				2CB42DE90C291F6800DA05E7 /* local_speex.a in Frameworks */,
+				2CB42DEA0C291F6800DA05E7 /* local_vorbis.a in Frameworks */,
+				2CB42DEB0C291F6800DA05E7 /* local_vorbisenc.a in Frameworks */,
+				2CB42DEC0C291F6800DA05E7 /* local_oggplay.a in Frameworks */,
+				2CB42DED0C291F6800DA05E7 /* local_theora.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -130,14 +130,14 @@
 		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				2CC888B50C28E8A300213FD7 /* libogg.a */,
-				2CC888BA0C28E8A300213FD7 /* libtheora.a */,
-				2CC888B70C28E8A300213FD7 /* libvorbis.a */,
-				2CC888B80C28E8A300213FD7 /* libvorbisenc.a */,
-				2CC888B60C28E8A300213FD7 /* libspeex.a */,
-				2CC888B30C28E8A300213FD7 /* libfishsound.a */,
-				2CC888B40C28E8A300213FD7 /* liboggz.a */,
-				2CC888B90C28E8A300213FD7 /* liboggplay.a */,
+				2CB42DDE0C291F6800DA05E7 /* local_fishsound.a */,
+				2CB42DDF0C291F6800DA05E7 /* local_oggz.a */,
+				2CB42DE00C291F6800DA05E7 /* local_ogg.a */,
+				2CB42DE10C291F6800DA05E7 /* local_speex.a */,
+				2CB42DE20C291F6800DA05E7 /* local_vorbis.a */,
+				2CB42DE30C291F6800DA05E7 /* local_vorbisenc.a */,
+				2CB42DE40C291F6800DA05E7 /* local_oggplay.a */,
+				2CB42DE50C291F6800DA05E7 /* local_theora.a */,
 				2C31AFE30BF455CB002C55BF /* Carbon.framework */,
 				2C96CCA30C0402280015B6AC /* AudioUnit.framework */,
 				2C83ABCA0BEAC328004C14F4 /* OpenGL.framework */,
@@ -315,11 +315,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -v\ncd $SRCROOT/..\n/Developer/gecko-sdk/bin/xpidl -m header  -I/Developer/gecko-sdk/idl nsILibOggPlugin.idl\n/Developer/gecko-sdk/bin/xpidl -m typelib -I/Developer/gecko-sdk/idl nsILibOggPlugin.idl\nexit 0\n";
+			shellScript = "set -v\ncd $SRCROOT/..\n/Developer/gecko-sdk/bin/xpidl -m header  -I/Developer/gecko-sdk/idl nsILibOggPlugin.idl\n/Developer/gecko-sdk/bin/xpidl -m typelib -I/Developer/gecko-sdk/idl nsILibOggPlugin.idl\n";
 		};
 		2CC886CD0C28BE3A00213FD7 /* Copy static libraries */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
@@ -329,7 +329,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -v\nSRC=/usr/local/lib\nDST=$SRCROOT/libs\nLIBS=\"libogg libtheora libvorbis libvorbisenc libspeex libfishsound liboggz liboggplay\"\n[ ! -d $DST ] && mkdir $DST\n[ ! -d $DST ] && echo \"Could not create $DST\" && exit 1\nfor L in $LIBS; do\n  if [ -e $SRC/$L.a ]; then\n    if [ $DST/$L.a -ot $SRC/$L.a ]; then\n      cp $SRC/$L.a $DST || exit 1\n    fi\n  else\n    echo \"Missing $SRC/$L.a\"\n    exit 1\n  fi\ndone\n";
+			shellScript = "SRC=/usr/local/lib\nDST=$SRCROOT/libs\nLIBS=\"ogg theora vorbis vorbisenc speex fishsound oggz oggplay\"\nechocmd() { echo \"$*\"; $*; }\n[ ! -d $DST ] && echocmd mkdir $DST\n[ ! -d $DST ] && echo \"Could not create $DST\" && exit 1\nfor L in $LIBS; do\n  if [ -e $SRC/lib$L.a ]; then\n    if [ $DST/local_$L.a -ot $SRC/lib$L.a ]; then\n      echocmd cp $SRC/lib$L.a $DST/local_$L.a || exit 1\n    fi\n  else\n    echo \"Missing $SRC/lib$L.a\"\n    exit 1\n  fi\ndone\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 



More information about the commits mailing list