[xiph-commits] r3474 - in browser_plugin/trunk: . Installer mac mac/liboggplay.xcodeproj src

j at svn.annodex.net j at svn.annodex.net
Sat Feb 16 04:50:20 PST 2008


Author: j
Date: 2008-02-16 04:50:18 -0800 (Sat, 16 Feb 2008)
New Revision: 3474

Added:
   browser_plugin/trunk/mac/
   browser_plugin/trunk/mac/README
Removed:
   browser_plugin/trunk/src/mac/
Modified:
   browser_plugin/trunk/Installer/MakeLinuxPluginXPI.sh
   browser_plugin/trunk/Installer/MakeMacPluginXPI.sh
   browser_plugin/trunk/mac/liboggplay.xcodeproj/project.pbxproj
   browser_plugin/trunk/mac/test.sh
Log:
* update xcode projet to new locations
* update Installer scripts



Modified: browser_plugin/trunk/Installer/MakeLinuxPluginXPI.sh
===================================================================
--- browser_plugin/trunk/Installer/MakeLinuxPluginXPI.sh	2008-02-16 12:30:50 UTC (rev 3473)
+++ browser_plugin/trunk/Installer/MakeLinuxPluginXPI.sh	2008-02-16 12:50:18 UTC (rev 3474)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-XPTFILE=../plugin/nsILibOggPlugin.xpt
-PLUGIN=../plugin/.libs/libnpoggplugin.so
+XPTFILE=../src/nsILibOggPlugin.xpt
+PLUGIN=../src/.libs/libnpoggplugin.so
 
 XPINAME=Oggplay-Linux.xpi
 

Modified: browser_plugin/trunk/Installer/MakeMacPluginXPI.sh
===================================================================
--- browser_plugin/trunk/Installer/MakeMacPluginXPI.sh	2008-02-16 12:30:50 UTC (rev 3473)
+++ browser_plugin/trunk/Installer/MakeMacPluginXPI.sh	2008-02-16 12:50:18 UTC (rev 3474)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-XPTFILE=../plugin/nsILibOggPlugin.xpt
-BUNDLE=../plugin/mac/build/Deployment/liboggplay.plugin
+XPTFILE=../src/nsILibOggPlugin.xpt
+BUNDLE=../mac/build/Deployment/liboggplay.plugin
 
 CPU=$(system_profiler SPHardwareDataType | awk '/CPU Type/{print $3}')
 if [ "x$CPU" = "x" ]; then

Copied: browser_plugin/trunk/mac (from rev 3472, browser_plugin/trunk/src/mac)

Added: browser_plugin/trunk/mac/README
===================================================================
--- browser_plugin/trunk/mac/README	                        (rev 0)
+++ browser_plugin/trunk/mac/README	2008-02-16 12:50:18 UTC (rev 3474)
@@ -0,0 +1,18 @@
+
+To build the plugin you have to install several libraries 
+in /usr/local or /opt/local(via ports).
+
+  libogg       i.e. via ports: port install libogg
+  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
+  libtheora    http://theora.org
+  liboggplay   from svn: http://svn.annodex.net/liboggplay/trunk
+
+You also need the gecko sdk for your platform in /Developer/gecko-sdk:
+ gecko-sdk for Intel Mac
+  http://www.oxymoronical.com/site/files/gecko-sdk-mac-intel-1.8.1.3.zip
+ gecko-sdk for PowerPc Mac
+  http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.8.0.4/sdk/gecko-sdk-mac-1.8.0.4.zip

Modified: browser_plugin/trunk/mac/liboggplay.xcodeproj/project.pbxproj
===================================================================
--- browser_plugin/trunk/src/mac/liboggplay.xcodeproj/project.pbxproj	2008-02-16 11:41:02 UTC (rev 3472)
+++ browser_plugin/trunk/mac/liboggplay.xcodeproj/project.pbxproj	2008-02-16 12:50:18 UTC (rev 3474)
@@ -8,18 +8,32 @@
 
 /* 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 */; };
+		093AFB630D67069300F8439A /* plugin_cmml.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB560D67069300F8439A /* plugin_cmml.h */; };
+		093AFB640D67069300F8439A /* plugin_gui_mac.c in Sources */ = {isa = PBXBuildFile; fileRef = 093AFB570D67069300F8439A /* plugin_gui_mac.c */; };
+		093AFB650D67069300F8439A /* plugin_gui.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB580D67069300F8439A /* plugin_gui.h */; };
+		093AFB660D67069300F8439A /* plugin_oggplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 093AFB590D67069300F8439A /* plugin_oggplay.c */; };
+		093AFB670D67069300F8439A /* plugin_oggplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB5A0D67069300F8439A /* plugin_oggplay.h */; };
+		093AFB680D67069300F8439A /* plugin_tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB5B0D67069300F8439A /* plugin_tools.h */; };
+		093AFB690D67069300F8439A /* plugin_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 093AFB5C0D67069300F8439A /* plugin_tools.c */; };
+		093AFB6A0D67069300F8439A /* plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093AFB5D0D67069300F8439A /* plugin.cpp */; };
+		093AFB6B0D67069300F8439A /* plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB5E0D67069300F8439A /* plugin.h */; };
+		093AFB6C0D67069300F8439A /* std_semaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB5F0D67069300F8439A /* std_semaphore.h */; };
+		093AFB710D67070B00F8439A /* nsScriptablePeer.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB6D0D67070B00F8439A /* nsScriptablePeer.h */; };
+		093AFB720D67070B00F8439A /* nsScriptablePeer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093AFB6E0D67070B00F8439A /* nsScriptablePeer.cpp */; };
+		093AFB730D67070B00F8439A /* npp_gate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093AFB6F0D67070B00F8439A /* npp_gate.cpp */; };
+		093AFB740D67070B00F8439A /* np_mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093AFB700D67070B00F8439A /* np_mac.cpp */; };
+		093AFB770D67073500F8439A /* pluginbase.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB750D67073500F8439A /* pluginbase.h */; };
+		093AFB780D67073500F8439A /* npplat.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB760D67073500F8439A /* npplat.h */; };
+		093AFB7B0D67075200F8439A /* sydney_audio_mac.c in Sources */ = {isa = PBXBuildFile; fileRef = 093AFB790D67075200F8439A /* sydney_audio_mac.c */; };
+		093AFB7C0D67075200F8439A /* sydney_audio_new.h in Headers */ = {isa = PBXBuildFile; fileRef = 093AFB7A0D67075200F8439A /* sydney_audio_new.h */; };
 		2C31AFE40BF455CB002C55BF /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C31AFE30BF455CB002C55BF /* Carbon.framework */; };
-		2C613F4F0C33950A00F9298C /* plugin_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C613F4E0C33950A00F9298C /* plugin_c.h */; };
-		2C6144610C348C0E00F9298C /* plugin_cmml.c in Sources */ = {isa = PBXBuildFile; fileRef = 2C61445F0C348C0E00F9298C /* plugin_cmml.c */; };
-		2C6144620C348C0E00F9298C /* plugin_cmml.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C6144600C348C0E00F9298C /* plugin_cmml.h */; };
 		2C83A7A10BE86E72004C14F4 /* liboggplay.r in Rez */ = {isa = PBXBuildFile; fileRef = 2C83A7110BE85E80004C14F4 /* liboggplay.r */; };
-		2C83A8620BE96764004C14F4 /* np_mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C83A8610BE96764004C14F4 /* np_mac.cpp */; };
-		2C83A8AB0BE9698F004C14F4 /* npp_gate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CD58C990BD33B65001D751D /* npp_gate.cpp */; };
 		2C83AB280BE9C6EB004C14F4 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C83AB270BE9C6EB004C14F4 /* AGL.framework */; };
 		2C83ABCB0BEAC328004C14F4 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C83ABCA0BEAC328004C14F4 /* OpenGL.framework */; };
 		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 */; };
 		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 */; };
@@ -29,19 +43,6 @@
 		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 */; };
-		2CD58C520BD319C3001D751D /* plugin_oggplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 2CD58C4C0BD319C3001D751D /* plugin_oggplay.c */; };
-		2CD58C530BD319C3001D751D /* plugin_oggplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CD58C4D0BD319C3001D751D /* plugin_oggplay.h */; };
-		2CD58C540BD319C3001D751D /* plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CD58C4E0BD319C3001D751D /* plugin.cpp */; };
-		2CD58C550BD319C3001D751D /* plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CD58C4F0BD319C3001D751D /* plugin.h */; };
-		2CD58C9C0BD33B65001D751D /* npplat.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CD58C940BD33B65001D751D /* npplat.h */; };
-		2CD58C9D0BD33B65001D751D /* pluginbase.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CD58C950BD33B65001D751D /* pluginbase.h */; };
-		2CD58CA10BD33B65001D751D /* nsScriptablePeer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CD58C9A0BD33B65001D751D /* nsScriptablePeer.cpp */; };
-		2CD58CA20BD33B65001D751D /* nsScriptablePeer.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CD58C9B0BD33B65001D751D /* nsScriptablePeer.h */; };
-		2CD6AD870C0D355B007E42D5 /* sydney_audio_new.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CD6AD860C0D355B007E42D5 /* sydney_audio_new.h */; };
-		2CF2FD440C191F8A0074A9C3 /* plugin_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 2CF2FD420C191F8A0074A9C3 /* plugin_tools.c */; };
-		2CF2FD450C191F8A0074A9C3 /* plugin_tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CF2FD430C191F8A0074A9C3 /* plugin_tools.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -58,19 +59,32 @@
 
 /* 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; };
+		093AFB560D67069300F8439A /* plugin_cmml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = plugin_cmml.h; path = ../src/plugin_cmml.h; sourceTree = SOURCE_ROOT; };
+		093AFB570D67069300F8439A /* plugin_gui_mac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = plugin_gui_mac.c; path = ../src/plugin_gui_mac.c; sourceTree = SOURCE_ROOT; };
+		093AFB580D67069300F8439A /* plugin_gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = plugin_gui.h; path = ../src/plugin_gui.h; sourceTree = SOURCE_ROOT; };
+		093AFB590D67069300F8439A /* plugin_oggplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = plugin_oggplay.c; path = ../src/plugin_oggplay.c; sourceTree = SOURCE_ROOT; };
+		093AFB5A0D67069300F8439A /* plugin_oggplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = plugin_oggplay.h; path = ../src/plugin_oggplay.h; sourceTree = SOURCE_ROOT; };
+		093AFB5B0D67069300F8439A /* plugin_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = plugin_tools.h; path = ../src/plugin_tools.h; sourceTree = SOURCE_ROOT; };
+		093AFB5C0D67069300F8439A /* plugin_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = plugin_tools.c; path = ../src/plugin_tools.c; sourceTree = SOURCE_ROOT; };
+		093AFB5D0D67069300F8439A /* plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = plugin.cpp; path = ../src/plugin.cpp; sourceTree = SOURCE_ROOT; };
+		093AFB5E0D67069300F8439A /* plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = plugin.h; path = ../src/plugin.h; sourceTree = SOURCE_ROOT; };
+		093AFB5F0D67069300F8439A /* std_semaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = std_semaphore.h; path = ../src/std_semaphore.h; sourceTree = SOURCE_ROOT; };
+		093AFB6D0D67070B00F8439A /* nsScriptablePeer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nsScriptablePeer.h; path = ../src/support/nsScriptablePeer.h; sourceTree = SOURCE_ROOT; };
+		093AFB6E0D67070B00F8439A /* nsScriptablePeer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nsScriptablePeer.cpp; path = ../src/support/nsScriptablePeer.cpp; sourceTree = SOURCE_ROOT; };
+		093AFB6F0D67070B00F8439A /* npp_gate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = npp_gate.cpp; path = ../src/support/npp_gate.cpp; sourceTree = SOURCE_ROOT; };
+		093AFB700D67070B00F8439A /* np_mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = np_mac.cpp; path = ../src/support/np_mac.cpp; sourceTree = SOURCE_ROOT; };
+		093AFB750D67073500F8439A /* pluginbase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pluginbase.h; path = ../src/include/pluginbase.h; sourceTree = SOURCE_ROOT; };
+		093AFB760D67073500F8439A /* npplat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npplat.h; path = ../src/include/npplat.h; sourceTree = SOURCE_ROOT; };
+		093AFB790D67075200F8439A /* sydney_audio_mac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sydney_audio_mac.c; path = ../src/audio/sydney_audio_mac.c; sourceTree = SOURCE_ROOT; };
+		093AFB7A0D67075200F8439A /* sydney_audio_new.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sydney_audio_new.h; path = ../src/audio/sydney_audio_new.h; sourceTree = SOURCE_ROOT; };
 		2C31AFE30BF455CB002C55BF /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		2C613F4E0C33950A00F9298C /* plugin_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = plugin_c.h; path = ../plugin_c.h; sourceTree = SOURCE_ROOT; };
-		2C6143210C34006500F9298C /* oggplay_tools.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_tools.c; path = ../../src/liboggplay/oggplay_tools.c; sourceTree = SOURCE_ROOT; };
-		2C61445F0C348C0E00F9298C /* plugin_cmml.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = plugin_cmml.c; path = ../plugin_cmml.c; sourceTree = SOURCE_ROOT; };
-		2C6144600C348C0E00F9298C /* plugin_cmml.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = plugin_cmml.h; path = ../plugin_cmml.h; sourceTree = SOURCE_ROOT; };
 		2C83A7110BE85E80004C14F4 /* liboggplay.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = liboggplay.r; sourceTree = "<group>"; };
-		2C83A8610BE96764004C14F4 /* np_mac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = np_mac.cpp; sourceTree = "<group>"; };
 		2C83AB270BE9C6EB004C14F4 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
 		2C83ABCA0BEAC328004C14F4 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		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; };
-		2C9F53E10C2A5727007365C0 /* nsILibOggPlugin.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = nsILibOggPlugin.idl; path = ../nsILibOggPlugin.idl; 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; };
 		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; };
@@ -79,48 +93,8 @@
 		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; };
-		2CD1C7700C30A04D00440526 /* oggplay_tcp_reader.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_tcp_reader.c; path = ../../src/liboggplay/oggplay_tcp_reader.c; sourceTree = SOURCE_ROOT; };
-		2CD1C7710C30A04D00440526 /* oggplay_callback.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_callback.h; path = ../../src/liboggplay/oggplay_callback.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7720C30A04D00440526 /* oggplay_seek.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_seek.c; path = ../../src/liboggplay/oggplay_seek.c; sourceTree = SOURCE_ROOT; };
-		2CD1C7730C30A04D00440526 /* oggplay_callback_info.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_callback_info.c; path = ../../src/liboggplay/oggplay_callback_info.c; sourceTree = SOURCE_ROOT; };
-		2CD1C7740C30A04D00440526 /* oggplay_private.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_private.h; path = ../../src/liboggplay/oggplay_private.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7750C30A04D00440526 /* oggplay_buffer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_buffer.c; path = ../../src/liboggplay/oggplay_buffer.c; sourceTree = SOURCE_ROOT; };
-		2CD1C7760C30A04D00440526 /* oggplay_data.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_data.h; path = ../../src/liboggplay/oggplay_data.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7770C30A04D00440526 /* oggplay_file_reader.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_file_reader.c; path = ../../src/liboggplay/oggplay_file_reader.c; sourceTree = SOURCE_ROOT; };
-		2CD1C7780C30A04D00440526 /* oggplay_buffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_buffer.h; path = ../../src/liboggplay/oggplay_buffer.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7790C30A04D00440526 /* oggplay_data.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_data.c; path = ../../src/liboggplay/oggplay_data.c; sourceTree = SOURCE_ROOT; };
-		2CD1C77A0C30A04D00440526 /* oggplay_query.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_query.c; path = ../../src/liboggplay/oggplay_query.c; sourceTree = SOURCE_ROOT; };
-		2CD1C77B0C30A04D00440526 /* oggplay_callback.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_callback.c; path = ../../src/liboggplay/oggplay_callback.c; sourceTree = SOURCE_ROOT; };
-		2CD1C77C0C30A04D00440526 /* oggplay_file_reader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_file_reader.h; path = ../../src/liboggplay/oggplay_file_reader.h; sourceTree = SOURCE_ROOT; };
-		2CD1C77D0C30A06500440526 /* oggplay_yuv2rgb.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay_yuv2rgb.c; path = ../../src/liboggplay/oggplay_yuv2rgb.c; sourceTree = SOURCE_ROOT; };
-		2CD1C77E0C30A06500440526 /* oggplay_tcp_reader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_tcp_reader.h; path = ../../src/liboggplay/oggplay_tcp_reader.h; sourceTree = SOURCE_ROOT; };
-		2CD1C77F0C30A06500440526 /* oggplay.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oggplay.c; path = ../../src/liboggplay/oggplay.c; sourceTree = SOURCE_ROOT; };
-		2CD1C78C0C30A10600440526 /* std_semaphore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = std_semaphore.h; path = ../../src/liboggplay/std_semaphore.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7A20C30A1A800440526 /* oggplay_callback_info.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_callback_info.h; path = ../../include/oggplay/oggplay_callback_info.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7A30C30A1A800440526 /* oggplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay.h; path = ../../include/oggplay/oggplay.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7A40C30A1A800440526 /* oggplay_tools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_tools.h; path = ../../include/oggplay/oggplay_tools.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7A50C30A1A800440526 /* oggplay_seek.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_seek.h; path = ../../include/oggplay/oggplay_seek.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7A60C30A1A800440526 /* oggplay_reader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_reader.h; path = ../../include/oggplay/oggplay_reader.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7A70C30A1A800440526 /* oggplay_query.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_query.h; path = ../../include/oggplay/oggplay_query.h; sourceTree = SOURCE_ROOT; };
-		2CD1C7A80C30A1A800440526 /* oggplay_enums.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = oggplay_enums.h; path = ../../include/oggplay/oggplay_enums.h; 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; };
-		2CD58C4C0BD319C3001D751D /* plugin_oggplay.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = plugin_oggplay.c; path = ../plugin_oggplay.c; sourceTree = SOURCE_ROOT; };
-		2CD58C4D0BD319C3001D751D /* plugin_oggplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = plugin_oggplay.h; path = ../plugin_oggplay.h; sourceTree = SOURCE_ROOT; };
-		2CD58C4E0BD319C3001D751D /* plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = plugin.cpp; path = ../plugin.cpp; sourceTree = SOURCE_ROOT; };
-		2CD58C4F0BD319C3001D751D /* plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = plugin.h; path = ../plugin.h; sourceTree = SOURCE_ROOT; };
 		2CD58C6E0BD33435001D751D /* liboggplay.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = liboggplay.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
-		2CD58C940BD33B65001D751D /* npplat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = npplat.h; sourceTree = "<group>"; };
-		2CD58C950BD33B65001D751D /* pluginbase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = pluginbase.h; sourceTree = "<group>"; };
-		2CD58C990BD33B65001D751D /* npp_gate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = npp_gate.cpp; sourceTree = "<group>"; };
-		2CD58C9A0BD33B65001D751D /* nsScriptablePeer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = nsScriptablePeer.cpp; sourceTree = "<group>"; };
-		2CD58C9B0BD33B65001D751D /* nsScriptablePeer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nsScriptablePeer.h; sourceTree = "<group>"; };
-		2CD6AD860C0D355B007E42D5 /* sydney_audio_new.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sydney_audio_new.h; path = ../audio/sydney_audio_new.h; sourceTree = SOURCE_ROOT; };
-		2CF2FD420C191F8A0074A9C3 /* plugin_tools.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = plugin_tools.c; path = ../plugin_tools.c; sourceTree = SOURCE_ROOT; };
-		2CF2FD430C191F8A0074A9C3 /* plugin_tools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = plugin_tools.h; path = ../plugin_tools.h; sourceTree = SOURCE_ROOT; };
-		2CF2FD5D0C1921E70074A9C3 /* plugin_gui_linux.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = plugin_gui_linux.c; path = ../plugin_gui_linux.c; sourceTree = SOURCE_ROOT; };
-		2CF2FD5E0C1921E70074A9C3 /* plugin_gui_win32.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = plugin_gui_win32.c; path = ../plugin_gui_win32.c; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -181,121 +155,68 @@
 		08FB77ADFE841716C02AAC07 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				2CD58C4E0BD319C3001D751D /* plugin.cpp */,
-				2CD58C4F0BD319C3001D751D /* plugin.h */,
-				2C613F4E0C33950A00F9298C /* plugin_c.h */,
-				2CD58C4C0BD319C3001D751D /* plugin_oggplay.c */,
-				2CD58C4D0BD319C3001D751D /* plugin_oggplay.h */,
-				2CD58C4A0BD319C3001D751D /* plugin_gui_mac.c */,
-				2CF2FD5D0C1921E70074A9C3 /* plugin_gui_linux.c */,
-				2CF2FD5E0C1921E70074A9C3 /* plugin_gui_win32.c */,
-				2CD58C4B0BD319C3001D751D /* plugin_gui.h */,
-				2C61445F0C348C0E00F9298C /* plugin_cmml.c */,
-				2C6144600C348C0E00F9298C /* plugin_cmml.h */,
-				2CF2FD420C191F8A0074A9C3 /* plugin_tools.c */,
-				2CF2FD430C191F8A0074A9C3 /* plugin_tools.h */,
-				2CA761D40BF978E10008A3B7 /* std_semaphore.h */,
-				2C9F53E10C2A5727007365C0 /* nsILibOggPlugin.idl */,
+				093AFB530D67069300F8439A /* nsILibOggPlugin.idl */,
+				093AFB540D67069300F8439A /* plugin_c.h */,
+				093AFB550D67069300F8439A /* plugin_cmml.c */,
+				093AFB560D67069300F8439A /* plugin_cmml.h */,
+				093AFB570D67069300F8439A /* plugin_gui_mac.c */,
+				093AFB580D67069300F8439A /* plugin_gui.h */,
+				093AFB590D67069300F8439A /* plugin_oggplay.c */,
+				093AFB5A0D67069300F8439A /* plugin_oggplay.h */,
+				093AFB5B0D67069300F8439A /* plugin_tools.h */,
+				093AFB5C0D67069300F8439A /* plugin_tools.c */,
+				093AFB5D0D67069300F8439A /* plugin.cpp */,
+				093AFB5E0D67069300F8439A /* plugin.h */,
+				093AFB5F0D67069300F8439A /* std_semaphore.h */,
 				2CF2FD540C191FD70074A9C3 /* audio */,
-				2CD58C930BD33B65001D751D /* include */,
-				2CD58C960BD33B65001D751D /* support */,
-				2CD1C7620C309DFF00440526 /* oggplay (not built) */,
+				096C51B80D670C4C008733B8 /* include */,
+				096C51B90D670C59008733B8 /* support */,
 			);
 			name = Source;
 			sourceTree = "<group>";
 		};
-		19C28FB4FE9D528D11CA2CBB /* Products */ = {
+		096C51B80D670C4C008733B8 /* include */ = {
 			isa = PBXGroup;
 			children = (
-				2CD58C6E0BD33435001D751D /* liboggplay.plugin */,
+				093AFB750D67073500F8439A /* pluginbase.h */,
+				093AFB760D67073500F8439A /* npplat.h */,
 			);
-			name = Products;
+			name = include;
 			sourceTree = "<group>";
 		};
-		2C83A7100BE85E5D004C14F4 /* Resources */ = {
+		096C51B90D670C59008733B8 /* support */ = {
 			isa = PBXGroup;
 			children = (
-				2CD58C410BD31543001D751D /* Info.plist */,
-				2C83A7110BE85E80004C14F4 /* liboggplay.r */,
+				093AFB700D67070B00F8439A /* np_mac.cpp */,
+				093AFB6F0D67070B00F8439A /* npp_gate.cpp */,
+				093AFB6E0D67070B00F8439A /* nsScriptablePeer.cpp */,
+				093AFB6D0D67070B00F8439A /* nsScriptablePeer.h */,
 			);
-			name = Resources;
+			name = support;
 			sourceTree = "<group>";
 		};
-		2CD1C7620C309DFF00440526 /* oggplay (not built) */ = {
+		19C28FB4FE9D528D11CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				2CD1C78D0C30A11A00440526 /* src */,
-				2CD1C78E0C30A12300440526 /* include */,
+				2CD58C6E0BD33435001D751D /* liboggplay.plugin */,
 			);
-			name = "oggplay (not built)";
+			name = Products;
 			sourceTree = "<group>";
 		};
-		2CD1C78D0C30A11A00440526 /* src */ = {
+		2C83A7100BE85E5D004C14F4 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				2CD1C77F0C30A06500440526 /* oggplay.c */,
-				2CD1C77A0C30A04D00440526 /* oggplay_query.c */,
-				2CD1C7720C30A04D00440526 /* oggplay_seek.c */,
-				2CD1C77B0C30A04D00440526 /* oggplay_callback.c */,
-				2CD1C7730C30A04D00440526 /* oggplay_callback_info.c */,
-				2CD1C7790C30A04D00440526 /* oggplay_data.c */,
-				2CD1C7750C30A04D00440526 /* oggplay_buffer.c */,
-				2CD1C77D0C30A06500440526 /* oggplay_yuv2rgb.c */,
-				2CD1C7700C30A04D00440526 /* oggplay_tcp_reader.c */,
-				2CD1C7770C30A04D00440526 /* oggplay_file_reader.c */,
-				2C6143210C34006500F9298C /* oggplay_tools.c */,
-				2CD1C7710C30A04D00440526 /* oggplay_callback.h */,
-				2CD1C77E0C30A06500440526 /* oggplay_tcp_reader.h */,
-				2CD1C77C0C30A04D00440526 /* oggplay_file_reader.h */,
-				2CD1C7740C30A04D00440526 /* oggplay_private.h */,
-				2CD1C7760C30A04D00440526 /* oggplay_data.h */,
-				2CD1C7780C30A04D00440526 /* oggplay_buffer.h */,
-				2CD1C78C0C30A10600440526 /* std_semaphore.h */,
+				2CD58C410BD31543001D751D /* Info.plist */,
+				2C83A7110BE85E80004C14F4 /* liboggplay.r */,
 			);
-			name = src;
+			name = Resources;
 			sourceTree = "<group>";
 		};
-		2CD1C78E0C30A12300440526 /* include */ = {
-			isa = PBXGroup;
-			children = (
-				2CD1C7A30C30A1A800440526 /* oggplay.h */,
-				2CD1C7A80C30A1A800440526 /* oggplay_enums.h */,
-				2CD1C7A20C30A1A800440526 /* oggplay_callback_info.h */,
-				2CD1C7A40C30A1A800440526 /* oggplay_tools.h */,
-				2CD1C7A50C30A1A800440526 /* oggplay_seek.h */,
-				2CD1C7A70C30A1A800440526 /* oggplay_query.h */,
-				2CD1C7A60C30A1A800440526 /* oggplay_reader.h */,
-			);
-			name = include;
-			sourceTree = "<group>";
-		};
-		2CD58C930BD33B65001D751D /* include */ = {
-			isa = PBXGroup;
-			children = (
-				2CD58C940BD33B65001D751D /* npplat.h */,
-				2CD58C950BD33B65001D751D /* pluginbase.h */,
-			);
-			name = include;
-			path = ../include;
-			sourceTree = SOURCE_ROOT;
-		};
-		2CD58C960BD33B65001D751D /* support */ = {
-			isa = PBXGroup;
-			children = (
-				2C83A8610BE96764004C14F4 /* np_mac.cpp */,
-				2CD58C990BD33B65001D751D /* npp_gate.cpp */,
-				2CD58C9A0BD33B65001D751D /* nsScriptablePeer.cpp */,
-				2CD58C9B0BD33B65001D751D /* nsScriptablePeer.h */,
-			);
-			name = support;
-			path = ../support;
-			sourceTree = SOURCE_ROOT;
-		};
 		2CF2FD540C191FD70074A9C3 /* audio */ = {
 			isa = PBXGroup;
 			children = (
-				2C96D1320C0666340015B6AC /* sydney_audio_mac.c */,
-				2CD6AD860C0D355B007E42D5 /* sydney_audio_new.h */,
+				093AFB7A0D67075200F8439A /* sydney_audio_new.h */,
+				093AFB790D67075200F8439A /* sydney_audio_mac.c */,
 			);
 			name = audio;
 			sourceTree = "<group>";
@@ -307,17 +228,17 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2CD58C510BD319C3001D751D /* plugin_gui.h in Headers */,
-				2CD58C530BD319C3001D751D /* plugin_oggplay.h in Headers */,
-				2CD58C550BD319C3001D751D /* plugin.h in Headers */,
-				2CD58C9C0BD33B65001D751D /* npplat.h in Headers */,
-				2CD58C9D0BD33B65001D751D /* pluginbase.h in Headers */,
-				2CD58CA20BD33B65001D751D /* nsScriptablePeer.h in Headers */,
-				2CA761D50BF978E10008A3B7 /* std_semaphore.h in Headers */,
-				2CD6AD870C0D355B007E42D5 /* sydney_audio_new.h in Headers */,
-				2CF2FD450C191F8A0074A9C3 /* plugin_tools.h in Headers */,
-				2C613F4F0C33950A00F9298C /* plugin_c.h in Headers */,
-				2C6144620C348C0E00F9298C /* plugin_cmml.h in Headers */,
+				093AFB610D67069300F8439A /* plugin_c.h in Headers */,
+				093AFB630D67069300F8439A /* plugin_cmml.h in Headers */,
+				093AFB650D67069300F8439A /* plugin_gui.h in Headers */,
+				093AFB670D67069300F8439A /* plugin_oggplay.h in Headers */,
+				093AFB680D67069300F8439A /* plugin_tools.h in Headers */,
+				093AFB6B0D67069300F8439A /* plugin.h in Headers */,
+				093AFB6C0D67069300F8439A /* std_semaphore.h in Headers */,
+				093AFB710D67070B00F8439A /* nsScriptablePeer.h in Headers */,
+				093AFB770D67073500F8439A /* pluginbase.h in Headers */,
+				093AFB780D67073500F8439A /* npplat.h in Headers */,
+				093AFB7C0D67075200F8439A /* sydney_audio_new.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -336,7 +257,6 @@
 				4D1684A60830226300080847 /* Frameworks */,
 				4D1684A90830226300080847 /* Rez */,
 				4D1684AB0830226300080847 /* CopyFiles */,
-				0939FBBC0D5705C20008ABBF /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -353,9 +273,11 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 2CD58C100BD309DD001D751D /* Build configuration list for PBXProject "liboggplay" */;
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 089C166AFE841209C02AAC07 /* MRJPlugin */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
 				4D16849D0830226300080847 /* liboggplay */,
 			);
@@ -368,6 +290,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2CD58C420BD31543001D751D /* Info.plist in Resources */,
+				093AFB600D67069300F8439A /* nsILibOggPlugin.idl in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -391,16 +314,16 @@
 			files = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/../nsILibOggPlugin.idl",
+				"$(SRCROOT)/../src/nsILibOggPlugin.idl",
 			);
 			name = "Process nsILibOggPlugin.idl";
 			outputPaths = (
-				"$(SRCROOT)/../nsILibOggPlugin.h",
-				"$(SRCROOT)/../nsILibOggPlugin.xpt",
+				"$(SRCROOT)/../src/nsILibOggPlugin.h",
+				"$(SRCROOT)/../src/nsILibOggPlugin.xpt",
 			);
 			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\n";
+			shellScript = "set -v\ncd $SRCROOT/../src\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;
@@ -423,15 +346,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2CD58C500BD319C3001D751D /* plugin_gui_mac.c in Sources */,
-				2CD58C520BD319C3001D751D /* plugin_oggplay.c in Sources */,
-				2CD58C540BD319C3001D751D /* plugin.cpp in Sources */,
-				2CD58CA10BD33B65001D751D /* nsScriptablePeer.cpp in Sources */,
-				2C83A8620BE96764004C14F4 /* np_mac.cpp in Sources */,
-				2C83A8AB0BE9698F004C14F4 /* npp_gate.cpp in Sources */,
-				2C96D1330C0666340015B6AC /* sydney_audio_mac.c in Sources */,
-				2CF2FD440C191F8A0074A9C3 /* plugin_tools.c in Sources */,
-				2C6144610C348C0E00F9298C /* plugin_cmml.c in Sources */,
+				093AFB620D67069300F8439A /* plugin_cmml.c in Sources */,
+				093AFB640D67069300F8439A /* plugin_gui_mac.c in Sources */,
+				093AFB660D67069300F8439A /* plugin_oggplay.c in Sources */,
+				093AFB690D67069300F8439A /* plugin_tools.c in Sources */,
+				093AFB6A0D67069300F8439A /* plugin.cpp in Sources */,
+				093AFB720D67070B00F8439A /* nsScriptablePeer.cpp in Sources */,
+				093AFB730D67070B00F8439A /* npp_gate.cpp in Sources */,
+				093AFB740D67070B00F8439A /* np_mac.cpp in Sources */,
+				093AFB7B0D67075200F8439A /* sydney_audio_mac.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -466,9 +389,9 @@
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					..,
-					../include,
-					../support,
+					../src,
+					../src/include,
+					../src/support,
 					"/Developer/gecko-sdk/include",
 					/Developer/Headers/FlatCarbon,
 				);
@@ -520,9 +443,9 @@
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					..,
-					../include,
-					../support,
+					../src,
+					../src/include,
+					../src/support,
 					"/Developer/gecko-sdk/include",
 					/Developer/Headers/FlatCarbon,
 				);

Modified: browser_plugin/trunk/mac/test.sh
===================================================================
--- browser_plugin/trunk/src/mac/test.sh	2008-02-16 11:41:02 UTC (rev 3472)
+++ browser_plugin/trunk/mac/test.sh	2008-02-16 12:50:18 UTC (rev 3474)
@@ -7,5 +7,5 @@
   ARG=""
 fi
 echo "Copying $SRC build"
-cp -r ../nsILibOggPlugin.xpt build/$SRC/liboggplay.plugin ~/Library/Internet\ Plug-Ins
+cp -r ../src/nsILibOggPlugin.xpt build/$SRC/liboggplay.plugin ~/Library/Internet\ Plug-Ins
 /Applications/Firefox.app/Contents/MacOS/firefox $ARG



More information about the commits mailing list