From cd887d6e6d712d7b8de8d4b9e956c726f24e5638 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 10 Nov 2009 00:50:39 +0000 Subject: updated corelibs/vanilla build using ext13 template svn path=/trunk/; revision=12734 --- externals/Makefile | 49 +++---------- externals/vanilla/Makefile | 175 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 177 insertions(+), 47 deletions(-) diff --git a/externals/Makefile b/externals/Makefile index 7acf2383..b39cbb79 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -128,7 +128,7 @@ CXXFLAGS = $(CFLAGS) # # WARNING! this MUST be all on one line because the automatic package # building scripts rely on it being that way. -LIB_TARGETS = adaptive bassemu boids bsaylor creb cxc cyclone deprecated earplug ekext ext13 flashserver flatspace flib freeverb ggee hardware hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iem_matrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders mapping markex maxlib mjlib moocow moonlib motex mrpeach msd oscx pan pdcontainer pddp pdogg pmpd sigpack smlib tof toxy unauthorized vbap windowing zexy +LIB_TARGETS = adaptive bassemu boids bsaylor creb cxc cyclone deprecated earplug ekext ext13 flashserver flatspace flib freeverb ggee hardware hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iem_matrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders mapping markex maxlib mjlib moocow moonlib motex mrpeach msd oscx pan pdcontainer pddp pdogg pmpd sigpack smlib tof toxy unauthorized vanilla vbap windowing zexy # this is for libraries that don't compile (yet) on all platforms ifeq ($(OS_NAME),windows) @@ -409,43 +409,6 @@ bsaylor_clean: -rm -f -- $(externals_src)/bsaylor/*.*~ - -#------------------------------------------------------------------------------# -# CORELIBS -CORELIBS_NAME=corelibs -CORELIBS_OBJECTS := $(wildcard $(externals_src)/corelibs/*.c) -corelibs: $(CORELIBS_OBJECTS:.c=.$(EXTENSION)) - -corelibs_install: corelibs - install -d $(DESTDIR)$(objectsdir)/$(CORELIBS_NAME) - $(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(CORELIBS_NAME) \ - --author "Miller Puckette and others" \ - --description "core libraries stripped out of Pd" \ - --license "BSD" \ - --version "" - install -p $(CORELIBS_OBJECTS:.c=.$(EXTENSION)) \ - $(DESTDIR)$(objectsdir)/$(CORELIBS_NAME) -# install -d $(DESTDIR)$(helpdir)/$(CORELIBS_NAME) -# install -p $(externals_src)/corelibs/help/*.pd \ -# $(DESTDIR)$(helpdir)/$(CORELIBS_NAME) -# install -d $(DESTDIR)$(manualsdir)/$(CORELIBS_NAME) -# install -p $(externals_src)/corelibs/manual.txt \ -# $(DESTDIR)$(manualsdir)/$(CORELIBS_NAME) - install -d $(DESTDIR)$(readmesdir) - install -p $(externals_src)/corelibs/README \ - $(DESTDIR)$(readmesdir)/$(CORELIBS_NAME).txt -# install -d $(DESTDIR)$(examplesdir)/$(CORELIBS_NAME) -# install -p $(externals_src)/corelibs/examples/*.pd \ -# $(DESTDIR)$(examplesdir)/$(CORELIBS_NAME) - -corelibs_clean: - -rm -f -- $(CORELIBS_OBJECTS:.c=.$(EXTENSION)) - -rm -f -- $(CORELIBS_OBJECTS:.c=.o) - -rm -f -- $(externals_src)/corelibs/*.bak - -rm -f -- $(externals_src)/corelibs/*.*~ - - - #------------------------------------------------------------------------------# # CREB CREB_NAME=creb @@ -2615,6 +2578,16 @@ vbap_clean: -rm -f -- $(externals_src)/vbap/*.*~ +#------------------------------------------------------------------------------# +# VANILLA +vanilla: + make -C $(externals_src)/vanilla + +vanilla_install: + make -C $(externals_src)/vanilla DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install + +vanilla_clean: + make -C $(externals_src)/vanilla clean #------------------------------------------------------------------------------# diff --git a/externals/vanilla/Makefile b/externals/vanilla/Makefile index a13265fb..c5b6b7bb 100644 --- a/externals/vanilla/Makefile +++ b/externals/vanilla/Makefile @@ -1,15 +1,172 @@ -TARGET := $(shell pwd | sed 's|.*/\(.*\)$$|\1|') -EXTERNALS_ROOT := $(shell pwd | sed 's|^\(/.*externals\).*|\1|') +# To use this Makefile for your project, first put the name of your library in +# LIBRARY_NAME variable. The folder for your project should have the same name +# as your library. +LIBRARY_NAME = vanilla -default: - make -C $(EXTERNALS_ROOT) $(TARGET) +# Next, add your source files to the SOURCES variable. +SOURCES = abs~.c bng.c cnv.c exp~.c hradio.c hsl.c log~.c nbx.c pow~.c print.c tgl.c vradio.c vslider.c vu.c + + +# For objects that only build on certain platforms, add those to the SOURCES +# line for the right platforms. +SOURCES_Darwin = +SOURCES_Linux = +SOURCES_Windows = + +#------------------------------------------------------------------------------# +# +# you shouldn't need to edit anything below here, if we did it right :) +# +#------------------------------------------------------------------------------# + +# where Pd lives +PD_PATH = ../../pd +# where to install the library +objectsdir = $(PD_PATH)/extra + +CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g +LDFLAGS = +LIBS = + +UNAME := $(shell uname -s) +ifeq ($(UNAME),Darwin) + CPU := $(shell uname -p) + ifeq ($(CPU),arm) # iPhone/iPod Touch + SOURCES += $(SOURCES_Darwin) + EXTENSION = pd_darwin + OS = iphoneos + IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin + CC=$(IPHONE_BASE)/gcc + CPP=$(IPHONE_BASE)/cpp + CXX=$(IPHONE_BASE)/g++ + ISYSROOT = -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk + IPHONE_CFLAGS = -miphoneos-version-min=3.0 $(ISYSROOT) -arch armv6 + OPT_CFLAGS = -fast -funroll-loops -fomit-frame-pointer + CFLAGS := $(IPHONE_CFLAGS) $(OPT_CFLAGS) $(CFLAGS) + LDFLAGS += -arch armv6 -bundle -undefined dynamic_lookup $(ISYSROOT) + LIBS += -lc + STRIP = strip -x + else # Mac OS X + SOURCES += $(SOURCES_Darwin) + EXTENSION = pd_darwin + OS = macosx + OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast + FAT_FLAGS = -arch i386 -arch ppc -mmacosx-version-min=10.4 + CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include + LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib + LIBS += -lc + STRIP = strip -x + endif +endif +ifeq ($(UNAME),Linux) + SOURCES += $(SOURCES_Linux) + EXTENSION = pd_linux + OS = linux + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + CFLAGS += -fPIC + LDFLAGS += -Wl,--export-dynamic -shared -fPIC + LIBS += -lc + STRIP = strip --strip-unneeded -R .note -R .comment +endif +ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) + SOURCES += + EXTENSION = dll + OS = cygwin + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + CFLAGS += + LDFLAGS += -Wl,--export-dynamic -shared -L$(PD_PATH)/src + LIBS += -lc -lpd + STRIP = strip --strip-unneeded -R .note -R .comment +endif +ifeq (MINGW,$(findstring MINGW,$(UNAME))) + SOURCES += $(SOURCES_Windows) + EXTENSION = dll + OS = windows + OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4 + WINDOWS_HACKS = -D'O_NONBLOCK=1' + CFLAGS += -mms-bitfields $(WINDOWS_HACKS) + LDFLAGS += -s -shared -Wl,--enable-auto-import + LIBS += -L$(PD_PATH)/src -L$(PD_PATH)/bin -L$(PD_PATH)/obj -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 + STRIP = strip --strip-unneeded -R .note -R .comment +endif + +CFLAGS += $(OPT_CFLAGS) + + +.PHONY = install libdir_install single_install install-doc install-exec clean dist etags + +all: $(SOURCES:.c=.$(EXTENSION)) + +%.o: %.c + $(CC) $(CFLAGS) -o "$*.o" -c "$*.c" + +%.$(EXTENSION): %.o + $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(LIBS) + chmod a-x "$*.$(EXTENSION)" + +# this links everything into a single binary file +$(LIBRARY_NAME): $(SOURCES:.c=.o) $(LIBRARY_NAME).o + $(CC) $(LDFLAGS) -o $(LIBRARY_NAME).$(EXTENSION) $(SOURCES:.c=.o) $(LIBRARY_NAME).o $(LIBS) + chmod a-x $(LIBRARY_NAME).$(EXTENSION) + + +install: libdir_install + +# The meta and help files are explicitly installed to make sure they are +# actually there. Those files are not optional, then need to be there. +libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-exec + install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + install -m644 -p $(LIBRARY_NAME)-meta.pd $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + install -m644 -p $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.c=.$(EXTENSION))) + +# install library linked as single binary +single_install: $(LIBRARY_NAME) install-doc install-exec + install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + install -m644 -p $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION) + +install-doc: + install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) +# install -m644 -p $(SOURCES:.c=-help.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + install -m644 -p README $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt + install -m644 -p VERSION $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/VERSION.txt + install -m644 -p CHANGES $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/CHANGES.txt + +install-exec: + install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) -install: - make -C $(EXTERNALS_ROOT) $(TARGET)_install clean: - make -C $(EXTERNALS_ROOT) $(TARGET)_clean + -rm -f -- $(SOURCES:.c=.o) + -rm -f -- $(SOURCES:.c=.$(EXTENSION)) + -rm -f -- $(LIBRARY_NAME).$(EXTENSION) + +distclean: clean + -rm -f -- ../$(LIBRARY_NAME)-$(OS)-$(shell uname -m).tar.bz2 + -rm -f -- ../$(LIBRARY_NAME)-$(OS).tar.bz2 + +dist: all dist_$(OS) + +dist_linux: + cd .. && tar --exclude=.svn -cjpf $(LIBRARY_NAME)-$(OS)-$(shell uname -m).tar.bz2 $(LIBRARY_NAME) + +dist_macosx: + cd .. && tar --exclude=.svn -cjpf $(LIBRARY_NAME)-$(OS).tar.bz2 $(LIBRARY_NAME) + +dist_windows: + cd .. && tar --exclude=.svn -cjpf $(LIBRARY_NAME)-$(OS).tar.bz2 $(LIBRARY_NAME) + -test_locations: - make -C $(EXTERNALS_ROOT) test_locations +etags: + etags *.[ch] ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h +showpaths: + @echo "PD_PATH: $(PD_PATH)" + @echo "objectsdir: $(objectsdir)" + @echo "LIBRARY_NAME: $(LIBRARY_NAME)" + @echo "SOURCES: $(SOURCES)" + @echo "UNAME: $(UNAME)" + @echo "CPU: $(CPU)" -- cgit v1.2.1