created pdogg libdir and build targets

svn path=/trunk/; revision=4308

4 files changed, 48 insertions, 4 deletions

diff --git a/externals/Makefile b/externals/Makefile
index 94d2d549..a9aab626 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -107,8 +107,8 @@ CXXFLAGS = $(CFLAGS)
 
 # if your library isn't included here, it won't be built with Pd-extended
 LIB_TARGETS = buildsrc creb cxc cyclone ext13 freeverb hid iemabs iemlib \
-iemmatrix loaders markex maxlib mjlib motex oscx pddp pdp pidip pmpd smlib toxy\
-unauthorized vbap zexy
+iemmatrix loaders markex maxlib mjlib motex oscx pddp pdogg pdp pidip pmpd \
+smlib toxy unauthorized vbap zexy
 
 
 all: pre_all_$(OS_NAME) buildsrc $(LIB_TARGETS)
@@ -740,6 +740,36 @@ pddp_clean:
 
 
 #------------------------------------------------------------------------------#
+# PDOGG
+PDOGG_NAME=pdogg
+PDOGG_OBJECTS := $(wildcard $(externals_src)/pdogg/*/*.c)
+pdogg: $(PDOGG_OBJECTS:.c=.$(EXTENSION))
+
+pdogg_install: pdogg
+	install -d $(objectsdir)/$(PDOGG_NAME)
+	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PDOGG_NAME) \
+		--author "Olaf Matthes" \
+		--description "objects for reading, writing, and streaming ogg" \
+		--license "LGPL" \
+		--version "0.2"
+	install -p $(PDOGG_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(PDOGG_NAME)
+	install -d $(helpdir)/$(PDOGG_NAME)
+	install -p $(externals_src)/pdogg/*/*.pd \
+		$(helpdir)/$(PDOGG_NAME)
+	install -d $(manualsdir)/$(PDOGG_NAME)
+	install -p $(externals_src)/pdogg/readme \
+		$(manualsdir)/$(PDOGG_NAME)/README.txt
+
+pdogg_clean:
+	-rm -f -- $(externals_src)/pdogg/*/*.$(EXTENSION)
+	-rm -f -- $(externals_src)/pdogg/*/*.o
+	-rm -f -- $(externals_src)/pdogg/*/*.bak
+	-rm -f -- $(externals_src)/pdogg/*/*.*~
+	-rm -f -- $(externals_src)/pdogg/*.*~
+
+
+
+#------------------------------------------------------------------------------#
 # PDP
 PDP_NAME=pdp
 $(externals_src)/pdp/configure: $(externals_src)/pdp/configure.ac
diff --git a/packages/TODO b/packages/TODO
index 99b649e2..0343b2dc 100644
--- a/packages/TODO
+++ b/packages/TODO
@@ -1,4 +1,12 @@
 
+- make pd-settings.reg and org.puredata.pd.plist have the same libs and same order
+
+- fix patch failures in patch_pd
+
+- make sure PDP is being added
+
+- add pan library
+
 - allow DESTDIR to be a relative path
 
 - fiddle~, bonk~, etc. didn't get installed
@@ -11,7 +19,7 @@
 - move darwin_app_perms to here and make generic prerelease_clean target which
   is called separately
 
-- test for configure before running autoconf/clean configure on distclean
+- test for "configure" before running autoconf, also rm "configure" on distclean
 
 - global optimization flags
   		ideally, you would use a version of Pd that is fully optimized for your
diff --git a/packages/darwin_app/org.puredata.pd.plist b/packages/darwin_app/org.puredata.pd.plist
index acdb29ac..3cd66cf5 100644
--- a/packages/darwin_app/org.puredata.pd.plist
+++ b/packages/darwin_app/org.puredata.pd.plist
@@ -38,5 +38,11 @@
 	<string>motex</string>
 	<key>loadlib17</key>
 	<string>iemabs</string>
+	<key>loadlib18</key>
+	<string>oscx</string>
+	<key>loadlib19</key>
+	<string>freeverb</string>
+	<key>loadlib20</key>
+	<string>pdogg</string>
 </dict>
 </plist>
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index 9a135142..a9b42fc2 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -4,7 +4,7 @@ Windows Registry Editor Version 5.00
 "loadlib1"="cyclone"

 "loadlib2"="maxlib"

 "loadlib3"="gripd"

-"loadlib4"="OSC"

+"loadlib4"="pdogg"

 "loadlib5"="pmpd"

 "loadlib6"="vasp"

 "loadlib7"="wmangle"