From 0ed7a8b68dd73e2b0473b8127aeca99f3bac9061 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Wed, 1 Apr 2009 21:13:09 +0000 Subject: cleaned up grill externals - replaced with svn:externals to svn.grrrr.org/ext/trunk/ svn path=/trunk/; revision=10951 --- .../grill/flext/buildsys/mac/gnumake-gcc-ext.inc | 37 ----------- .../grill/flext/buildsys/mac/gnumake-gcc-flext.inc | 77 ---------------------- .../flext/buildsys/mac/gnumake-gcc-targets.inc | 70 -------------------- externals/grill/flext/buildsys/mac/gnumake-gcc.inc | 74 --------------------- .../grill/flext/buildsys/mac/max/config-gcc.def | 75 --------------------- .../flext/buildsys/mac/max/gnumake-gcc-ext.inc | 23 ------- .../flext/buildsys/mac/max/gnumake-gcc-flext.inc | 20 ------ .../grill/flext/buildsys/mac/max/gnumake-gcc.inc | 6 -- .../grill/flext/buildsys/mac/pd/config-gcc.def | 72 -------------------- .../flext/buildsys/mac/pd/gnumake-gcc-ext.inc | 10 --- .../flext/buildsys/mac/pd/gnumake-gcc-flext.inc | 11 ---- .../grill/flext/buildsys/mac/pd/gnumake-gcc.inc | 10 --- 12 files changed, 485 deletions(-) delete mode 100644 externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc delete mode 100644 externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc delete mode 100644 externals/grill/flext/buildsys/mac/gnumake-gcc-targets.inc delete mode 100644 externals/grill/flext/buildsys/mac/gnumake-gcc.inc delete mode 100644 externals/grill/flext/buildsys/mac/max/config-gcc.def delete mode 100644 externals/grill/flext/buildsys/mac/max/gnumake-gcc-ext.inc delete mode 100644 externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc delete mode 100644 externals/grill/flext/buildsys/mac/max/gnumake-gcc.inc delete mode 100644 externals/grill/flext/buildsys/mac/pd/config-gcc.def delete mode 100644 externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc delete mode 100644 externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc delete mode 100644 externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc (limited to 'externals/grill/flext/buildsys/mac') diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc deleted file mode 100644 index bbcdf4ad..00000000 --- a/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc +++ /dev/null @@ -1,37 +0,0 @@ -# build class specific settings - -INCPATH += -I$(FLEXTINC) -LIBPATH += -L$(FLEXTLIB) -LIBS += -l$(FLEXTNAME) - -# common compilation stuff -include $(BUILDPATH)$(PLATFORM)/gnumake-gcc-targets.inc - -##### linking ################### - -$(TARGET) :: $(OBJPATH) $(TARGETPATH) - -$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS) - $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) -ifdef DEBUG -else -ifdef PROFILE -else - strip -x $@ -endif -endif - chmod 755 $@ - -ifdef TARGETPOST -$(TARGET) :: $(TARGETPOST) -endif - -################################### - -# Attention: $@ doesn't work for paths with spaces.... -$(INSTPATH): - -mkdir -p $(INSTPATH) - -_install_:: $(INSTPATH) -# copy plain file or whole bundle - cp -R $(INSTTARGET) $(INSTPATH) diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc deleted file mode 100644 index 916e21cc..00000000 --- a/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc +++ /dev/null @@ -1,77 +0,0 @@ -# build class specific settings - -ifdef SHARED -LDFLAGS += -install_name $(FLEXTLIB)/$(TARGETNAME) -LDFLAGS += -current_version $(FLEXTMAJOR).$(FLEXTMINOR).$(FLEXTMICRO) -LDFLAGS += -compatibility_version $(FLEXTMAJOR).$(FLEXTMINOR) -LDFLAGS += -preload -seg1addr 0xd0000000 -endif - -# common compilation stuff -include $(BUILDPATH)$(PLATFORM)/gnumake-gcc-targets.inc - -##### linking ################### - -$(TARGET) :: $(OBJPATH) $(TARGETPATH) - -$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS) -ifdef SHARED - $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) -ifdef DEBUG -else -ifdef PROFILE -else - strip -x $@ -endif -endif - chmod 755 $@ -else - libtool -static -o $@ $(COBJS) $(CPPOBJS) -endif - -ifdef TARGETPOST -$(TARGET) :: $(TARGETPOST) -endif - -################################### - -$(FLEXTINC): - -mkdir -p $@ - -$(FLEXTLIB): - -mkdir -p $@ - -_install_: $(FLEXTINC) $(FLEXTLIB) -ifdef FLEXTFRAMEWORK -# --- install as framework --- - mkdir -p $(FLEXTFRAMEWORK)/Versions/$(FLEXTMAJOR).$(FLEXTMINOR)/Headers - ln -sfh ./$(FLEXTMAJOR).$(FLEXTMINOR) $(FLEXTFRAMEWORK)/Versions/Current - ln -sfh ./Versions/Current/Headers $(FLEXTFRAMEWORK)/Headers - install $(TARGET) $(FLEXTFRAMEWORK)/Versions/Current -ifdef SHARED - # make link without lib... and extension - ln -sf ./Versions/Current/$(VERNAME) $(FLEXTFRAMEWORK)/$(patsubst lib%,%,$(basename $(TARGETNAME))) -else - ranlib $(FRAMEWORK)/Versions/Current/$(VERNAME) - ln -sf ./Versions/Current/$(VERNAME) $(FLEXTFRAMEWORK)/$(TARGETNAME) -endif - install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTFRAMEWORK)/Headers -else -# --- install as dynamic library --- - install $(TARGET) $(FLEXTLIB) -ifndef SHARED -# have to rerun ranlib at install dir ?! - ranlib $(FLEXTLIB)/$(VERNAME) -endif -ifdef VERNAME - ln -sf $(VERNAME) $(FLEXTLIB)/$(TARGETNAME) -endif - install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) -endif -# transfer build system -# cp -rf buildsys $(FLEXTSYS) -# install build.sh $(FLEXTSYS) -# chmod -R a+rx $(FLEXTSYS) -# make convenience script -# echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh -# chmod a+rx $(FLEXTBIN)/flext-build.sh diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc-targets.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc-targets.inc deleted file mode 100644 index c8804667..00000000 --- a/externals/grill/flext/buildsys/mac/gnumake-gcc-targets.inc +++ /dev/null @@ -1,70 +0,0 @@ -############################################## - -CSRCS := $(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) -CPPSRCS := $(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) -COBJS := $(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) -CPPOBJS := $(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) - -############################################## - -# default target -_build_: $(TARGET) - -$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) - touch $@ - -# Attention: $@ doesn't work for paths with spaces.... -$(OBJPATH): - -mkdir -p $(OBJPATH) - -# Attention: $@ doesn't work for paths with spaces.... -$(TARGETPATH): - -mkdir -p $(TARGETPATH) - -##### precompiled header file ################### - -ifdef PRECOMPILE -PRECOMSRC := $(SRCDIR)/$(PRECOMPILE) -else -PRECOMSRC := $(FLEXTINC)/flext.h -endif - -ifdef PRECOMSRC -PRECOMDST := $(OBJPATH)/$(notdir $(PRECOMSRC)).gch -PRECOMINC := -I $(OBJPATH) -endif - -$(PRECOMDST) : $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS)) - -mkdir -p $(dir $@) - $(CXX) -c $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@ - -##### architecture-specific compilation ################### - -define ARCH_COMPILE -$(OBJPATH)/%.opp_$(1) : $(SRCDIR)/%.cpp - -mkdir -p $(dir $$@) - $(CXX) -c $(CFLAGS) -arch $(1) $$(CFLAGS_$(1)) $(DEFS) $(PRECOMINC) $(INCPATH) $$^ -o $$@ - -$(OBJPATH)/%.o_$(1) : $(SRCDIR)/%.c - -mkdir -p $(dir $$@) - $(CC) -c $(CFLAGS) -arch $(1) $$(CFLAGS_$(1)) $(DEFS) $(INCPATH) $$^ -o $$@ -endef - -# implement for all archs in ARCH -$(foreach arch,$(ARCH),$(eval $(call ARCH_COMPILE,$(arch)))) - -##### make fat object file ################### - -$(OBJPATH)/%.opp : $(foreach arch,$(ARCH),$(OBJPATH)/%.opp_$(arch)) - lipo $^ -create -output $@ - -$(OBJPATH)/%.o : $(foreach arch,$(ARCH),$(OBJPATH)/%.o_$(arch)) - lipo $^ -create -output $@ - -############################################## - -_clean_: - -rm -r $(TARGETPATH) - -rm -r $(OBJPATH) - -############################################## diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc.inc deleted file mode 100644 index 41eac3fd..00000000 --- a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc +++ /dev/null @@ -1,74 +0,0 @@ -############################################## - -ifneq (,$(findstring Frameworks,$(FLEXTPREFIX))) -FLEXTFRAMEWORK := $(FLEXTPREFIX)/flext.framework -endif - -ifdef FLEXTFRAMEWORK -ifndef FLEXTLIB -FLEXTLIB := $(FLEXTFRAMEWORK) -endif -ifndef FLEXTINC -FLEXTINC := $(FLEXTFRAMEWORK)/Headers -endif -ifndef FLEXTSYS -FLEXTSYS := $(FLEXTFRAMEWORK)/Resources -endif -else -ifndef FLEXTLIB -FLEXTLIB := $(FLEXTPREFIX)/lib -endif -ifndef FLEXTINC -FLEXTINC := $(FLEXTPREFIX)/include/flext -endif -ifndef FLEXTSYS -FLEXTSYS := $(FLEXTPREFIX)/lib/flext -endif -endif - -FLEXTBIN := $(FLEXTPREFIX)/bin - -############################################## - -LDFLAGS += -dynamic -framework ApplicationServices -framework vecLib - -############################################## - -ifdef DEBUG -CFLAGS += -g -LDFLAGS += -g -else -ifdef PROFILE -CFLAGS += -g -LDFLAGS += -g -else -LDFLAGS += -Wl,-S -endif -endif - -############################################## - -ifdef STK_INC -INCPATH += -I$(STK_INC) -endif -ifdef STK_LIB -LIBS += $(STK_LIB) -endif - -############################################## - -ifdef SNDOBJ_INC -INCPATH += -I$(SNDOBJ_INC) -endif -ifdef SNDOBJ_LIB -LIBS += $(SNDOBJ_LIB) -endif - -############################################## - -LDFLAGS += $(patsubst %,-arch %,$(ARCH)) - -ifdef OSXSDK -CFLAGS += -isysroot $(OSXSDK) -LDFLAGS += -isysroot $(OSXSDK) -endif diff --git a/externals/grill/flext/buildsys/mac/max/config-gcc.def b/externals/grill/flext/buildsys/mac/max/config-gcc.def deleted file mode 100644 index cec5b624..00000000 --- a/externals/grill/flext/buildsys/mac/max/config-gcc.def +++ /dev/null @@ -1,75 +0,0 @@ -# where are the Max/MSP SDK header files? -# you should have the latest version! -MAXSDKPATH=/Applications/MaxMSP\ 4.6/MaxMSP-SDK/c74support - -############################################################### - -# prefix for flext installation -# headers are in $(FLEXTPREFIX)/include/flext -# libraries are in $(FLEXTPREFIX)/lib -# build system is in $(FLEXTPREFIX)/lib/flext - -FLEXTPREFIX=/usr/local - -############################################################### - -# where should the external be built? -OUTPATH=max-darwin - -# where should the external be installed? -INSTPATH=/Library/Application\ Support/Cycling\ \'74/externals/flext - -# where should the initialization files be installed? -INITPATH=/Library/Application\ Support/Cycling\ \'74/init - -# where should the help files be installed? -HELPPATH=/Applications/MaxMSP\ 4.6/max-help/flext - -############################################################### - -# STK (synthesis tool kit) support -# http://ccrma.stanford.edu/software/stk - -# where to find the STK header files (e.g. stk.h) -STK_INC=/usr/local/include/stk - -# where to find the STK library (normally libstk.a) -# (comment out STK_LIB if you don't use STK) -#STK_LIB=/usr/local/lib/libstk.a - -############################################################### - -# SndObj support -# http://music.nuim.ie//musictec/SndObj - -# where to find the SndObj header files (e.g. sndobj.h) -SNDOBJ_INC=/usr/local/include/sndobj - -# where to find the SndObj library (normally libsndobj.a) -# (comment out STK_LIB if you don't use SndObj) -#SNDOBJ_LIB=/usr/local/lib/libsndobj.a - -############################################################### - -# user defined compiler flags -UFLAGS += -ffast-math - -# user defined optimization flags -OFLAGS += -Os -ftree-vectorize - -# user defined debugging flags -DFLAGS += - -# architecture-specific flags (optional) -UFLAGS_ppc += -maltivec -faltivec -OFLAGS_ppc += -mtune=G4 -DFLAGS_ppc += - -UFLAGS_i386 += -mmmx -msse -msse2 -msse3 -OFLAGS_i386 += -mtune=prescott -DFLAGS_i386 += - -# cross-compilation (optional) -#ARCH=i386 ppc -#OSXSDK=/Developer/SDKs/MacOSX10.4u.sdk - diff --git a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/max/gnumake-gcc-ext.inc deleted file mode 100644 index 5266a698..00000000 --- a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-ext.inc +++ /dev/null @@ -1,23 +0,0 @@ -EXT=mxo - -############################################## - -LDFLAGS += -bundle - -############################################## - -OBJPATH=$(OUTPATH)/$(OUTSUB) - -# bundle name (build site) -INSTTARGET=$(OBJPATH)/$(OUTNAME).$(EXT) -# folder inside bundle (build site) -TARGETPATH=$(INSTTARGET)/Contents/MacOS -# file inside bundle (build site) -TARGET=$(TARGETPATH)/$(OUTNAME) - -# post build target -TARGETPOST=$(INSTTARGET)/Contents/Pkginfo - -$(INSTTARGET)/Contents/Pkginfo: - echo "iLaX????" >> $@ - diff --git a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc deleted file mode 100644 index 3d526804..00000000 --- a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc +++ /dev/null @@ -1,20 +0,0 @@ -ifdef SHARED -EXT=dylib -else -EXT=a -endif - -############################################## - -LDFLAGS += -dynamiclib - -############################################## - -OBJPATH=$(OUTPATH)/$(OUTSUB) -TARGETPATH=$(OBJPATH) - -TARGETNAME=$(OUTNAME).$(EXT) -VERNAME=$(OUTNAME).$(FLEXTMAJOR).$(FLEXTMINOR).$(FLEXTMICRO).$(EXT) -TARGET=$(TARGETPATH)/$(VERNAME) - -INSTTARGET=$(TARGET) diff --git a/externals/grill/flext/buildsys/mac/max/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/max/gnumake-gcc.inc deleted file mode 100644 index 44313f62..00000000 --- a/externals/grill/flext/buildsys/mac/max/gnumake-gcc.inc +++ /dev/null @@ -1,6 +0,0 @@ -DEFS += -DFLEXT_SYS=1 - -INCPATH += -I$(MAXSDKPATH)/max-includes -I$(MAXSDKPATH)/jit-includes -I$(MAXSDKPATH)/msp-includes - -LDFLAGS += -framework MaxAPI -framework MaxAudioAPI - diff --git a/externals/grill/flext/buildsys/mac/pd/config-gcc.def b/externals/grill/flext/buildsys/mac/pd/config-gcc.def deleted file mode 100644 index a724b2e4..00000000 --- a/externals/grill/flext/buildsys/mac/pd/config-gcc.def +++ /dev/null @@ -1,72 +0,0 @@ -# where is the PD installation including source code? -# (this should point to the main folder, which has a "src" subfolder) -PDPATH=/Applications/Pd-0.40-2.app/Contents/Resources - -# where is the PD executable? -PDBIN=$(PDPATH)/bin/pd - -############################################################### - -# prefix for flext installation -# headers are in $(FLEXTPREFIX)/include/flext -# libraries are in $(FLEXTPREFIX)/lib -# build system is in $(FLEXTPREFIX)/lib/flext - -FLEXTPREFIX=/usr/local - -############################################################### - -# where should the external be built? -OUTPATH=pd-darwin - -# where should the external be installed? -INSTPATH=$(PDPATH)/extra - -############################################################### - -# STK (synthesis tool kit) support -# http://ccrma.stanford.edu/software/stk - -# where to find the STK header files (e.g. stk.h) -STK_INC=/usr/local/include/stk - -# where to find the STK library (normally libstk.a) -# (comment out STK_LIB if you don't use STK) -#STK_LIB=/usr/local/lib/libstk.a - -############################################################### - -# SndObj support -# http://music.nuim.ie//musictec/SndObj - -# where to find the SndObj header files (e.g. sndobj.h) -SNDOBJ_INC=/usr/local/include/sndobj - -# where to find the SndObj library (normally libsndobj.a) -# (comment out STK_LIB if you don't use SndObj) -#SNDOBJ_LIB=/usr/local/lib/libsndobj.a - -############################################################### - -# user defined compiler flags -UFLAGS += -ffast-math - -# user defined optimization flags -OFLAGS += -Os -ftree-vectorize - -# user defined debugging flags -DFLAGS += - -# architecture-specific flags (optional) -UFLAGS_ppc += -maltivec -faltivec -OFLAGS_ppc += -mtune=G4 -DFLAGS_ppc += - -UFLAGS_i386 += -mmmx -msse -msse2 -msse3 -OFLAGS_i386 += -mtune=prescott -DFLAGS_i386 += - -# cross-compilation (optional) -#ARCH=i386 ppc -#OSXSDK=/Developer/SDKs/MacOSX10.4u.sdk - diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc deleted file mode 100644 index 5eb0a234..00000000 --- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc +++ /dev/null @@ -1,10 +0,0 @@ -EXT=pd_darwin - -LDFLAGS += -bundle -bundle_loader $(PDBIN) - -# it seems we are having symbol name clashes with the following "new preferred method" -# so we rather stick to the above "deprecated method" -#LDFLAGS += -dynamiclib -undefined dynamic_lookup - -TARGET=$(TARGETPATH)/$(TARGETNAME) -INSTTARGET=$(TARGET) diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc deleted file mode 100644 index 782606fc..00000000 --- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc +++ /dev/null @@ -1,11 +0,0 @@ -ifdef SHARED -EXT=dylib -else -EXT=a -endif - -LDFLAGS += -dynamiclib -flat_namespace -undefined suppress - -VERNAME=$(OUTNAME).$(FLEXTMAJOR).$(FLEXTMINOR).$(FLEXTMICRO).$(EXT) -TARGET=$(TARGETPATH)/$(VERNAME) -INSTTARGET=$(TARGET) diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc deleted file mode 100644 index 9d2fc3f3..00000000 --- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc +++ /dev/null @@ -1,10 +0,0 @@ -DEFS += -DFLEXT_SYS=2 -DPD - -INCPATH += -I$(PDPATH)/src -LIBPATH += -L$(PDPATH)/bin - -############################################## - -OBJPATH=$(OUTPATH)/$(OUTSUB) -TARGETPATH=$(OBJPATH) -TARGETNAME=$(OUTNAME).$(EXT) -- cgit v1.2.1