From cc82691ffa52ed04f98bf6828ab9d87845c7c31b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 17 Mar 2006 05:00:54 +0000 Subject: added mapping and tweaked hardware and markex to get it working smoothly with Pd-extended svn path=/trunk/; revision=4726 --- externals/Makefile | 46 ++++++++++++++++++++++++++++++++++++++++------ externals/TODO | 28 ++++++++++++++++++++++++++++ externals/build/TODO | 32 -------------------------------- 3 files changed, 68 insertions(+), 38 deletions(-) create mode 100644 externals/TODO delete mode 100644 externals/build/TODO (limited to 'externals') diff --git a/externals/Makefile b/externals/Makefile index b1716288..6c6c938d 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -106,8 +106,8 @@ CXXFLAGS = $(CFLAGS) # if your library isn't included in LIB_TARGETS, it won't be built with # Pd-extended. For libraries that build on all platforms, add them directly # below, otherwise add to the correct platforms below. -LIB_TARGETS = buildsrc creb cxc cyclone ext13 freeverb iemabs iemlib \ -iemmatrix loaders markex maxlib mjlib motex oscx pddp pdogg pmpd \ +LIB_TARGETS = buildsrc creb cxc cyclone ext13 freeverb hardware iemabs iemlib \ +iemmatrix loaders mapping markex maxlib mjlib motex oscx pddp pdogg pmpd \ sigpack smlib toxy unauthorized vbap zexy # this is for libraries that don't compile (yet) on all platforms @@ -115,7 +115,8 @@ ifeq ($(OS_NAME),windows) LIB_TARGETS += else ifeq ($(OS_NAME),darwin) - LIB_TARGETS += hid pdp + LIB_TARGETS += hid +# LIB_TARGETS += hid pdp else # GNU/Linux, BSD, IRIX, etc. LIB_TARGETS += hid pdp pidip @@ -510,8 +511,9 @@ freeverb_clean: #------------------------------------------------------------------------------# # HARDWARE HARDWARE_NAME=hardware -HARDWARE_OBJECTS := $(wildcard $(externals_src)/hardware/*/*.c) \ -$(wildcard $(externals_src)/hardware/*/*.cpp) +HARDWARE_OBJECTS := $(wildcard $(externals_src)/hardware/*/*.cpp) +# multio.c requires libusb, so don't include it yet... +#$(wildcard $(externals_src)/hardware/*/*.c) hardware: $(HARDWARE_OBJECTS:.c=.$(EXTENSION)) $(HARDWARE_OBJECTS:.cpp=.$(EXTENSION)) hardware_install: hardware @@ -708,10 +710,42 @@ loaders_clean: -rm -f -- $(externals_src)/loaders/*.*~ +#------------------------------------------------------------------------------# +# MAPPING +MAPPING_NAME=mapping +MAPPING_OBJECTS := $(wildcard $(externals_src)/mapping/src/*.c) +mapping: $(MAPPING_OBJECTS:.c=.$(EXTENSION)) + +mapping_install: mapping + install -d $(objectsdir)/$(MAPPING_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(MAPPING_NAME) \ + --author "Cyrille Henry and Hans-Christoph Steiner" \ + --description "objects for mapping data to control" \ + --license "GNU GPL" \ + --version "" + install -p $(MAPPING_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(MAPPING_NAME) + install -p $(externals_src)/mapping/*.pd $(objectsdir)/$(MAPPING_NAME) + install -d $(helpdir)/$(MAPPING_NAME) + install -p $(externals_src)/mapping/help/*.pd \ + $(helpdir)/$(MAPPING_NAME) + install -d $(manualsdir)/$(MAPPING_NAME) + install -p $(externals_src)/mapping/README.txt \ + $(manualsdir)/$(MAPPING_NAME)/README.txt + install -d $(examplesdir)/$(MAPPING_NAME) + install -p $(externals_src)/mapping/examples/*.pd \ + $(examplesdir)/$(MAPPING_NAME) + +mapping_clean: + -rm -f -- $(externals_src)/mapping/*.$(EXTENSION) + -rm -f -- $(externals_src)/mapping/src/*.o + -rm -f -- $(externals_src)/mapping/*.bak + -rm -f -- $(externals_src)/mapping/*.*~ + + #------------------------------------------------------------------------------# # MARKEX MARKEX_NAME=markex -MARKEX_OBJECTS := $(wildcard $(externals_src)/markex/*.c) +MARKEX_OBJECTS := $(wildcard $(externals_src)/markex/[a-z]*.c) markex: $(MARKEX_OBJECTS:.c=.$(EXTENSION)) markex_install: markex diff --git a/externals/TODO b/externals/TODO new file mode 100644 index 00000000..6d45af77 --- /dev/null +++ b/externals/TODO @@ -0,0 +1,28 @@ + +- make iemlibs into libdir for backwards compatibility + +- make C++ compile targets (packages/darwin_app/Makefile has some) + +- add version number getters from packages/Makefile + +- document externals building following the smlib example + +- add "test lib" functionality to binary building in externals/Makefile + +- add in mtx_ objects with special characters using setup functions and + filenames with 0x escapes (mtx_/ and mtx_./ for example). Make sure to have + the objects call the correct setup function since it can change the + functionality + +- put objects with conflicting names into a directory namespace + + Gem/scale + iem/prepend + flext/prepend + +- add these to the build system: + PDContainer + ann + grh + iemstream + iemxmlrpc diff --git a/externals/build/TODO b/externals/build/TODO deleted file mode 100644 index 61140429..00000000 --- a/externals/build/TODO +++ /dev/null @@ -1,32 +0,0 @@ - -- try compiling with as many warnings as possible Currently, this is the - setup: -Wall -W -Wno-unused -Wno-parentheses -Wno-switch -Wno-shadow - -- fix PDP inclusion. it seems to get skipped on Darwin. maybe with ifeq(windows... - -- make C++ compile targets (packages/darwin_app/Makefile has some) - -- add version number getters from packages/Makefile - -- document externals building following the smlib example - -- add "test lib" functionality to binary building in externals/Makefile - -- add in mtx_ objects with special characters using setup functions and - filenames with 0x escapes (mtx_/ and mtx_./ for example). Make sure to have - the objects call the correct setup function since it can change the - functionality - -- put objects with conflicting names into a directory namespace - - maxlib/scale - Gem/scale - iem/prepend - flext/prepend - -- add these to the build system: - PDContainer - ann - grh - iemstream - iemxmlrpc -- cgit v1.2.1