aboutsummaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
Diffstat (limited to 'externals')
-rw-r--r--externals/Makefile103
-rw-r--r--externals/build/TODO10
-rw-r--r--externals/build/win/makefile5
-rw-r--r--externals/build/win/oggamp~.libs2
-rw-r--r--externals/build/win/oggcast~.libs2
-rw-r--r--externals/build/win/oggread~.libs1
-rw-r--r--externals/build/win/oggwrite~.libs1
7 files changed, 81 insertions, 43 deletions
diff --git a/externals/Makefile b/externals/Makefile
index c9b8793d..5fcee3ba 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -59,7 +59,8 @@ pre_all_unknown:
# INSTALL
install: all $(objectsdir) help_install objects_install unfiltered_install \
creb_install cyclone_install iemabs_install iemabs_install iemmatrix_install \
- pddp_install pdp_install pmpd_install toxy_install vbap_install zexy_install
+ pddp_install pdp_install pmpd_install toxy_install unauthorized_install \
+ vbap_install zexy_install
@echo " "
@echo "externals install succeeded!"
@@ -197,8 +198,8 @@ cyclone_install: cyclone
install -p *.* $(helpdir)/$(CYCLONE_NAME)
# install -d $(manualsdir)/$(CYCLONE_NAME)
install -d $(examplesdir)/$(CYCLONE_NAME)
- install -p $(externals_src)/miXed/test/cyclone/*.* \
- $(examplesdir)/$(CYCLONE_NAME)
+ cd $(externals_src)/miXed/test/cyclone && \
+ install -p *.* $(examplesdir)/$(CYCLONE_NAME)
@@ -215,11 +216,12 @@ iemabs_install: iemabs
install -d $(objectsdir)/$(IEMABS_NAME)
$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(IEMABS_NAME) \
--description "a collection of objects written at IEM/KUG"
- install -p $(shell ls -1 $(externals_src)/iemlib/iemabs/*.pd | grep -v 'help') \
- $(objectsdir)/$(IEMABS_NAME)
+ cd $(externals_src)/iemlib/iemabs/ && \
+ install -p $(shell cd $(externals_src)/iemlib/iemabs/ && ls -1 *.pd | \
+ grep -v 'help') $(objectsdir)/$(IEMABS_NAME)
install -d $(helpdir)/$(IEMABS_NAME)
- install -p $(externals_src)/iemlib/iemabs/*help*.pd \
- $(helpdir)/$(IEMABS_NAME)
+ cd $(externals_src)/iemlib/iemabs/ && \
+ install -p *help*.pd $(helpdir)/$(IEMABS_NAME)
install -p $(externals_src)/iemlib/iemabs/*.mp3 $(helpdir)/$(IEMABS_NAME)
install -p $(externals_src)/iemlib/iemabs/*.wav $(helpdir)/$(IEMABS_NAME)
install -d $(manualsdir)/$(IEMABS_NAME)
@@ -297,13 +299,16 @@ pdp:
#TODO: compile gem2pdp here
pdp_install: pdp
-# install -d $(objectsdir)/$(PDP_NAME)
-# install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir)
-# install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir)
-# install -p $(externals_src)/gem2pdp/*.$(EXTENSION) $(objectsdir)
- install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)
-# install -d $(helpdir)/$(PDP_NAME)
- install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir)
+ install -d $(objectsdir)/$(PDP_NAME)
+ $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PDP_NAME) \
+ --author "Tom Schouten" \
+ --description "Pure Data Packet" \
+ --license "GNU GPL"
+ -install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir)/$(PDP_NAME)
+ -install -p $(externals_src)/gem2pdp/*.$(EXTENSION) $(objectsdir)/$(PDP_NAME)
+ install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)/$(PDP_NAME)
+ install -d $(helpdir)/$(PDP_NAME)
+ install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir)/$(PDP_NAME)
install -d $(manualsdir)/$(PDP_NAME)
install -p $(externals_src)/pdp/doc/reference.txt $(manualsdir)/$(PDP_NAME)
install -p $(externals_src)/pdp/doc/introduction/*.* \
@@ -313,6 +318,29 @@ pdp_install: pdp
$(examplesdir)/$(PDP_NAME)
+#------------------------------------------------------------------------------#
+# PIDIP
+PIDIP_NAME=pidip
+pidip:
+# cd $(externals_src)/pidip && ./configure && $(MAKE)
+
+pidip_install: pidip
+ install -d $(objectsdir)/$(PIDIP_NAME)
+ $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PIDIP_NAME) \
+ --author "Yves Degoyon" \
+ --description "PiDiP is Definitely in Pieces"
+ -install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir)/$(PIDIP_NAME)
+ install -d $(helpdir)/$(PIDIP_NAME)
+ install -p $(externals_src)/pidip/doc/*.pd $(helpdir)/$(PIDIP_NAME)
+ install -d $(examplesdir)/$(PIDIP_NAME)
+ install -p $(externals_src)/pidip/patches/*.* $(examplesdir)/$(PIDIP_NAME)
+ install -d $(examplesdir)/$(PIDIP_NAME)/images
+ install -p $(externals_src)/pidip/patches/images/*.* \
+ $(examplesdir)/$(PIDIP_NAME)/images
+ install -d $(examplesdir)/$(PIDIP_NAME)/morphology
+ install -p $(externals_src)/pidip/patches/morphology/*.* \
+ $(examplesdir)/$(PIDIP_NAME)/morphology
+
#------------------------------------------------------------------------------#
# PMPD
@@ -323,8 +351,7 @@ pmpd:
pmpd_install: pmpd
# install -d $(objectsdir)/$(PMPD_NAME)
install -d $(helpdir)/$(PMPD_NAME)
- install -p $(externals_src)/pmpd/help/*.pd \
- $(helpdir)/$(PMPD_NAME)
+ install -p $(externals_src)/pmpd/help/*.pd $(helpdir)
install -d $(manualsdir)/$(PMPD_NAME)
install -d $(manualsdir)/$(PMPD_NAME)
install -p $(externals_src)/pmpd/doc/pmpd.pdf/pmpd.pdf \
@@ -360,6 +387,31 @@ toxy_install: toxy
$(examplesdir)/$(TOXY_NAME)
+#------------------------------------------------------------------------------#
+# UNAUTHORIZED
+UNAUTHORIZED_NAME=unauthorized
+# unauthorized is compiled straight into $(OUT_DIR)
+UNAUTHORIZED_OUT_DIR=$(objectsdir)/$(UNAUTHORIZED_NAME)
+unauthorized:
+
+
+unauthorized_install: unauthorized
+# this needs to go here since it produces errors
+ -cd $(externals_src)/unauthorized && $(MAKE) -k
+ install -d $(objectsdir)/$(UNAUTHORIZED_NAME)
+ install -p $(externals_src)/unauthorized/*/*.$(EXTENSION) \
+ $(objectsdir)/$(UNAUTHORIZED_NAME)
+ install -d $(helpdir)/$(UNAUTHORIZED_NAME)
+ install -p $(externals_src)/unauthorized/*/*.pd \
+ $(helpdir)/$(UNAUTHORIZED_NAME)
+ install -p $(externals_src)/unauthorized/*/*.txt \
+ $(helpdir)/$(UNAUTHORIZED_NAM)
+ install -p $(externals_src)/unauthorized/*/*.pls \
+ $(helpdir)/$(UNAUTHORIZED_NAME)
+ install -d $(helpdir)/$(UNAUTHORIZED_NAME)/blm
+ install -p $(externals_src)/unauthorized/blinkenlights/blm/*.* \
+ $(helpdir)/$(UNAUTHORIZED_NAME)/blm
+
#------------------------------------------------------------------------------#
# VBAP
@@ -390,11 +442,13 @@ zexy:
zexy_install: zexy
install -d $(objectsdir)/$(ZEXY_NAME)
# install -p $(externals_src)/zexy/src/*.$(EXTENSION) $(objectsdir)/$(ZEXY_NAME)
- install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | \
- grep -v '-help.pd' | sed 's/\([&<>|~]\)/\\\1/g') \
+ install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | grep -v '-help.pd' | sed 's|\(.*\)|"\1"|g') \
$(objectsdir)/$(ZEXY_NAME)
+# grep -v '-help.pd' | sed 's/\([&<>|~]\)/\\\1/g') \
+
install -d $(helpdir)/$(ZEXY_NAME)
- install -p $(externals_src)/zexy/abs/*-help.pd $(helpdir)/$(ZEXY_NAME)
+ install -p $(shell ls -1 $(externals_src)/zexy/abs/*-help.pd | sed 's|\(.*\)|"\1"|g') \
+ $(helpdir)/$(ZEXY_NAME)
install -p $(externals_src)/zexy/zexy.pd $(helpdir)
install -p $(externals_src)/zexy/examples/*.* $(helpdir)/$(ZEXY_NAME)
@@ -431,15 +485,6 @@ unfiltered_install:
-cd $(externals_src)/OSCx && $(MAKE) CC=gcc
-install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir)
install -p $(externals_src)/OSCx/doc/*.* $(helpdir)
-#----------------------------------------------------------------------------
-# unauthorized
-# these don't work on Windows yet
- -cd $(externals_src)/unauthorized && $(MAKE)
- -install -p $(externals_src)/unauthorized/*/*.$(EXTENSION) $(objectsdir)
- install -p $(externals_src)/unauthorized/*/*.pd $(helpdir)
- install -p $(externals_src)/unauthorized/*/*.txt $(helpdir)
- install -p $(externals_src)/unauthorized/*/*.pls $(helpdir)
- cp -Rfp $(externals_src)/unauthorized/blinkenlights/blm $(helpdir)
#==============================================================================#
@@ -466,7 +511,7 @@ clean: install_clean
cd $(externals_src)/mixed/cyclone && make $(DEST_PATHS) clean
cd $(externals_src)/mixed/pddp && make $(DEST_PATHS) clean
cd $(externals_src)/mixed/toxy && make $(DEST_PATHS) clean
- cd $(externals_src)/unauthorized && make $(DEST_PATHS) clean
+ cd $(externals_src)/unauthorized && make clean
distclean: clean cruft_clean
rm $(externals_src)/OSCx Makefile
diff --git a/externals/build/TODO b/externals/build/TODO
index 7f6e5de6..ad5d4e12 100644
--- a/externals/build/TODO
+++ b/externals/build/TODO
@@ -6,7 +6,9 @@
subdir.
- get externals/build/src/prepend.c to compile in Pd mode, which means it will
- have a right inlet when created without an argument
+ have a right inlet when created without an argument (because of cyclone's
+ buld system, its quite difficult to do. I think it should just be removed
+ from default)
- add in mtx_ objects with special characters using setup functions and
filenames with 0x escapes (mtx_/ and mtx_./ for example). Make sure to have
@@ -25,12 +27,6 @@
cxc/prepend
flext/prepend
-- move .libs files to externals/build/src from externals/build/PLATFORM. The
- platform-specific makefiles copy them before compiling. If a
- platform-specific .libs file is needed, create it in the
- externals/build/PLATFORM directory. The makefiles will use both:
- `test -f $*.libs && cat $*.libs` `test -f ../src/$*.libs && cat ../src/$*.libs`
-
- add these to the build system:
PDContainer
ann
diff --git a/externals/build/win/makefile b/externals/build/win/makefile
index 43ee83fb..137fb2cf 100644
--- a/externals/build/win/makefile
+++ b/externals/build/win/makefile
@@ -48,8 +48,8 @@ OPTIM_FLAGS = -O3 -march=i686 -mfpmath=sse -msse
CFLAGS = -Wall -W -Wshadow -Wstrict-prototypes -Wno-unused -Wno-parentheses \
-Wno-switch $(OPTIM_FLAGS)
-INCLUDE = -I. -I.. -I$(PD_PATH)/src -IC:/msys/1.0/local/include
-LDFLAGS = -shared -LC:/msys/1.0/local/lib -L$(PD_PATH)/bin -lpd
+INCLUDE = -I. -I.. -I$(PD_PATH)/src -IC:/msys/1.0/include
+LDFLAGS = -shared -LC:/msys/1.0/lib -L$(PD_PATH)/bin -lpd
all: externals
@@ -65,7 +65,6 @@ externals: $(EXTERNALS:.c=.dll)
`test -f $*.libs && cat $*.libs` \
`test -f ../src/$*.libs && cat ../src/$*.libs`
$(STRIP) "$*.dll"
-# strip --strip-all "$*.dll"
rm "$*.o"
clean:
diff --git a/externals/build/win/oggamp~.libs b/externals/build/win/oggamp~.libs
index f203f33f..726b7910 100644
--- a/externals/build/win/oggamp~.libs
+++ b/externals/build/win/oggamp~.libs
@@ -1 +1 @@
--logg -lvorbisenc -lvorbisfile -lvorbis -lpthreadGC2 -lwsock32
+-lwsock32 -lpthreadGC2
diff --git a/externals/build/win/oggcast~.libs b/externals/build/win/oggcast~.libs
index 8801af95..726b7910 100644
--- a/externals/build/win/oggcast~.libs
+++ b/externals/build/win/oggcast~.libs
@@ -1 +1 @@
--logg -lvorbis -lvorbisenc -lvorbisfile -lwsock32 -lpthreadGC2
+-lwsock32 -lpthreadGC2
diff --git a/externals/build/win/oggread~.libs b/externals/build/win/oggread~.libs
deleted file mode 100644
index 28114c53..00000000
--- a/externals/build/win/oggread~.libs
+++ /dev/null
@@ -1 +0,0 @@
--logg -lvorbis -lvorbisenc -lvorbisfile
diff --git a/externals/build/win/oggwrite~.libs b/externals/build/win/oggwrite~.libs
deleted file mode 100644
index 28114c53..00000000
--- a/externals/build/win/oggwrite~.libs
+++ /dev/null
@@ -1 +0,0 @@
--logg -lvorbis -lvorbisenc -lvorbisfile