[xiph-commits] r3479 - in browser_plugin/trunk/mac: . liboggplay.xcodeproj

j at svn.annodex.net j at svn.annodex.net
Sat Feb 16 20:24:51 PST 2008


Author: j
Date: 2008-02-16 20:24:51 -0800 (Sat, 16 Feb 2008)
New Revision: 3479

Modified:
   browser_plugin/trunk/mac/README
   browser_plugin/trunk/mac/liboggplay.xcodeproj/project.pbxproj
Log:
mac info also link to 1.0-branch and remove liboil dependency since that is not used in that branch

Modified: browser_plugin/trunk/mac/README
===================================================================
--- browser_plugin/trunk/mac/README	2008-02-17 04:22:55 UTC (rev 3478)
+++ browser_plugin/trunk/mac/README	2008-02-17 04:24:51 UTC (rev 3479)
@@ -6,8 +6,7 @@
   liboggz      from svn: http://svn.annodex.net/oggz/trunk
   libvorbis    i.e. via ports: port install libvorbis
   libspeex     i.e. via ports: port install speex
-  liboil-0.3   i.e. via ports: port install liboil
-  libfishsound from svn: http://svn.annodex.net/libfishsound/trunk
+  libfishsound from svn: http://svn.annodex.net/libfishsound/branches/1.0-stable
   libtheora    http://theora.org
   liboggplay   from svn: http://svn.annodex.net/liboggplay/trunk
 

Modified: browser_plugin/trunk/mac/liboggplay.xcodeproj/project.pbxproj
===================================================================
--- browser_plugin/trunk/mac/liboggplay.xcodeproj/project.pbxproj	2008-02-17 04:22:55 UTC (rev 3478)
+++ browser_plugin/trunk/mac/liboggplay.xcodeproj/project.pbxproj	2008-02-17 04:24:51 UTC (rev 3479)
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		09247D450D5B1839001D5920 /* local_oil-0.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 09247D440D5B1839001D5920 /* local_oil-0.3.a */; };
 		093AFB600D67069300F8439A /* nsILibOggPlugin.idl in Resources */ = {isa = PBXBuildFile; fileRef = 093AFB530D67069300F8439A /* nsILibOggPlugin.idl */; };
 		093AFB610D67069300F8439A /* plugin_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB540D67069300F8439A /* plugin_c.h */; };
 		093AFB620D67069300F8439A /* plugin_cmml.c in Sources */ = {isa = PBXBuildFile; fileRef = 093AFB550D67069300F8439A /* plugin_cmml.c */; };
@@ -58,7 +57,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		09247D440D5B1839001D5920 /* local_oil-0.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "local_oil-0.3.a"; path = "libs/local_oil-0.3.a"; sourceTree = "<group>"; };
 		093AFB530D67069300F8439A /* nsILibOggPlugin.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = nsILibOggPlugin.idl; path = ../src/nsILibOggPlugin.idl; sourceTree = SOURCE_ROOT; };
 		093AFB540D67069300F8439A /* plugin_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = plugin_c.h; path = ../src/plugin_c.h; sourceTree = SOURCE_ROOT; };
 		093AFB550D67069300F8439A /* plugin_cmml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = plugin_cmml.c; path = ../src/plugin_cmml.c; sourceTree = SOURCE_ROOT; };
@@ -114,7 +112,6 @@
 				2CB42DEB0C291F6800DA05E7 /* local_vorbisenc.a in Frameworks */,
 				2CB42DEC0C291F6800DA05E7 /* local_oggplay.a in Frameworks */,
 				2CB42DED0C291F6800DA05E7 /* local_theora.a in Frameworks */,
-				09247D450D5B1839001D5920 /* local_oil-0.3.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -135,7 +132,6 @@
 		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				09247D440D5B1839001D5920 /* local_oil-0.3.a */,
 				2CB42DDE0C291F6800DA05E7 /* local_fishsound.a */,
 				2CB42DDF0C291F6800DA05E7 /* local_oggz.a */,
 				2CB42DE00C291F6800DA05E7 /* local_ogg.a */,
@@ -337,7 +333,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# If Xcode can find a .dylib of the same name as our static .a libraries, it\n# will *automatically* use dynamic linking, and there is NO way to tell it\n# otherwise. What's worse, Xcode magically knows about /usr/local/lib, so simply\n# moving the .a files away from there isn't sufficient; we have to rename them\n# as well. Bravo, Xcode writers, bravo. What happened to letting the *users*\n# decide what they want to do? Oh wait, that's right, this is a Mac.\n\nSRC=/usr/local/lib\nPORT_SRC=/opt/local/lib\nDST=$SRCROOT/libs\nLIBS=\"ogg theora vorbis vorbisenc speex fishsound oggz oggplay oil-0.3\"\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  elif [ -e $PORT_SRC/lib$L.a ]; then\n    if [ $DST/local_$L.a -ot $P
 ORT_SRC/lib$L.a ]; then\n      echocmd cp $PORT_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";
+			shellScript = "# If Xcode can find a .dylib of the same name as our static .a libraries, it\n# will *automatically* use dynamic linking, and there is NO way to tell it\n# otherwise. What's worse, Xcode magically knows about /usr/local/lib, so simply\n# moving the .a files away from there isn't sufficient; we have to rename them\n# as well. Bravo, Xcode writers, bravo. What happened to letting the *users*\n# decide what they want to do? Oh wait, that's right, this is a Mac.\n\nSRC=/usr/local/lib\nPORT_SRC=/opt/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  elif [ -e $PORT_SRC/lib$L.a ]; then\n    if [ $DST/local_$L.a -ot $PORT_SRC/
 lib$L.a ]; then\n      echocmd cp $PORT_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