diff options
Diffstat (limited to 'externals/grill/flext/buildsys')
61 files changed, 1293 insertions, 1027 deletions
diff --git a/externals/grill/flext/buildsys/bmake-ext.inc b/externals/grill/flext/buildsys/bmake-ext.inc index d959aaca..1455c83e 100644 --- a/externals/grill/flext/buildsys/bmake-ext.inc +++ b/externals/grill/flext/buildsys/bmake-ext.inc @@ -1 +1 @@ -OUTNAME=$(NAME)
+OUTNAME=$(NAME) diff --git a/externals/grill/flext/buildsys/bmake-flext.inc b/externals/grill/flext/buildsys/bmake-flext.inc index 8d3f177c..2e7faf0c 100644 --- a/externals/grill/flext/buildsys/bmake-flext.inc +++ b/externals/grill/flext/buildsys/bmake-flext.inc @@ -1,3 +1,3 @@ -DEFS=$(DEFS) /DFLEXT_EXPORTS
-
-OUTNAME=$(FLEXTNAME)
+DEFS=$(DEFS) /DFLEXT_EXPORTS + +OUTNAME=$(FLEXTNAME) diff --git a/externals/grill/flext/buildsys/bmake-sub.mak b/externals/grill/flext/buildsys/bmake-sub.mak index 29028377..7b0c7b7a 100644 --- a/externals/grill/flext/buildsys/bmake-sub.mak +++ b/externals/grill/flext/buildsys/bmake-sub.mak @@ -18,44 +18,22 @@ !endif ############################## - -!ifndef TARGETMODE -!ifdef DEBUG -TARGETMODE=debug -!else -TARGETMODE=release -!endif -!endif - -!ifndef TARGETTYPE -!ifdef SHARED -TARGETTYPE=shared -!else -!ifdef THREADED -TARGETTYPE=multi -!else -TARGETTYPE=single -!endif -!endif -!endif - -############################## # flext-specific make stuff -!include $(BUILDPATH)bmake-$(BUILDCLASS).inc - !include $(BUILDPATH)bmake.inc +!include $(BUILDPATH)bmake-$(BUILDCLASS).inc + ############################## # platform-specific make stuff -!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\bmake-$(COMPILER)-$(BUILDCLASS).inc - !include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\bmake-$(COMPILER).inc +!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\bmake-$(COMPILER)-$(BUILDCLASS).inc + ############################## # general make stuff -!include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER)-$(BUILDCLASS).inc - !include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER).inc + +!include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER)-$(BUILDCLASS).inc diff --git a/externals/grill/flext/buildsys/bmake.inc b/externals/grill/flext/buildsys/bmake.inc index 6495c2de..bdd99818 100644 --- a/externals/grill/flext/buildsys/bmake.inc +++ b/externals/grill/flext/buildsys/bmake.inc @@ -1,55 +1,59 @@ -##############################################
-# flext defines
-##############################################
-
-!ifdef SHARED
-# --- shared ---
-DEFS=$(DEFS) /DFLEXT_SHARED
-
-!else
-!ifdef THREADED
-# --- static multi-threaded ---
-DEFS=$(DEFS) /DFLEXT_THREADS
-
-!else
-# --- static single-threaded ---
-
-!endif
-!endif
-
-##############################################
-# name of flext library
-##############################################
-
-!ifdef SHARED
-
-!ifdef DEBUG
-FLEXTNAME=flext-$(RTSYS)_d
-!else
-FLEXTNAME=flext-$(RTSYS)
-!endif
-
-!else
-
-!ifdef THREADED
-!ifdef DEBUG
-FLEXTNAME=flext-$(RTSYS)_td
-!else
-FLEXTNAME=flext-$(RTSYS)_t
-!endif
-!else
-!ifdef DEBUG
-FLEXTNAME=flext-$(RTSYS)_sd
-!else
-FLEXTNAME=flext-$(RTSYS)_s
-!endif
-!endif
-
-!endif # SHARED
-
-##############################################
-# product name and folder
-##############################################
-
-OUTNAME=$(NAME)
-OUTSUB=$(TARGETMODE)-$(TARGETTYPE)
+############################################## +# flext defines +############################################## + +!ifdef SHARED +# --- shared --- +DEFS=$(DEFS) /DFLEXT_SHARED + +!else +!ifdef THREADED +# --- static multi-threaded --- +DEFS=$(DEFS) /DFLEXT_THREADS + +!else +# --- static single-threaded --- + +!endif +!endif + +############################################## +# name of flext library +############################################## + +!ifdef SHARED + +!ifdef DEBUG +FLEXTNAME=flext-$(RTSYS)_d +!else +FLEXTNAME=flext-$(RTSYS) +!endif + +!else + +!ifdef THREADED +!ifdef DEBUG +FLEXTNAME=flext-$(RTSYS)_td +!else +FLEXTNAME=flext-$(RTSYS)_t +!endif +!else +!ifdef DEBUG +FLEXTNAME=flext-$(RTSYS)_sd +!else +FLEXTNAME=flext-$(RTSYS)_s +!endif +!endif + +!endif # SHARED + +############################################## +# product name and folder +############################################## + +!ifndef SRCDIR +SRCDIR=. +!endif + +OUTNAME=$(NAME) +OUTSUB=$(TARGETMODE)-$(TARGETTYPE) diff --git a/externals/grill/flext/buildsys/bmake.mak b/externals/grill/flext/buildsys/bmake.mak index 1fb937ce..b3a29d03 100644 --- a/externals/grill/flext/buildsys/bmake.mak +++ b/externals/grill/flext/buildsys/bmake.mak @@ -12,7 +12,9 @@ PKGINFO=package.txt !endif +!if "$(PKGINFO)" != "" !include $(PKGINFO) +!endif ############################################### # check variables @@ -31,13 +33,13 @@ BUILDTYPE=single ############################## -!ifndef TARGETMODE -TARGETMODE=$(BUILDMODE) -!endif +#!ifndef TARGETMODE +#TARGETMODE=$(BUILDMODE) +#!endif -!ifndef TARGETTYPE -TARGETTYPE=$(BUILDTYPE) -!endif +#!ifndef TARGETTYPE +#TARGETTYPE=$(BUILDTYPE) +#!endif ############################################### diff --git a/externals/grill/flext/buildsys/build-cygwin.sh b/externals/grill/flext/buildsys/build-cygwin.sh index fa740016..606eaade 100644 --- a/externals/grill/flext/buildsys/build-cygwin.sh +++ b/externals/grill/flext/buildsys/build-cygwin.sh @@ -1,3 +1,5 @@ +#! /bin/bash + build=${0%/*}/ make -f ${build}gnumake.mak PLATFORM=$1 RTSYS=$2 COMPILER=cygwin BUILDPATH=${build} $3 $4 $5 $6 $7 $8 $9 diff --git a/externals/grill/flext/buildsys/build-gcc.sh b/externals/grill/flext/buildsys/build-gcc.sh index 3fffd918..ab4b5570 100644 --- a/externals/grill/flext/buildsys/build-gcc.sh +++ b/externals/grill/flext/buildsys/build-gcc.sh @@ -1,3 +1,5 @@ +#! /bin/bash + build=${0%/*}/ make -f ${build}gnumake.mak PLATFORM=$1 RTSYS=$2 COMPILER=gcc BUILDPATH=${build} $3 $4 $5 $6 $7 $8 $9 diff --git a/externals/grill/flext/buildsys/gnumake-sub.mak b/externals/grill/flext/buildsys/gnumake-sub.mak index 5e1dfc73..a7de50ce 100644 --- a/externals/grill/flext/buildsys/gnumake-sub.mak +++ b/externals/grill/flext/buildsys/gnumake-sub.mak @@ -18,44 +18,22 @@ ifdef USRMAKE endif ############################## - -ifndef TARGETMODE -ifdef DEBUG - TARGETMODE=debug -else - TARGETMODE=release -endif -endif - -ifndef TARGETTYPE -ifdef SHARED - TARGETTYPE=shared -else -ifdef THREADED - TARGETTYPE=multi -else - TARGETTYPE=single -endif -endif -endif - -############################## # flext-specific definitions -include $(BUILDPATH)gnumake-$(BUILDCLASS).inc - include $(BUILDPATH)gnumake.inc +include $(BUILDPATH)gnumake-$(BUILDCLASS).inc + ############################## # platform-specific make stuff -include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER)-$(BUILDCLASS).inc - include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER).inc +include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER)-$(BUILDCLASS).inc + ############################## # general make stuff -include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER)-$(BUILDCLASS).inc - include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER).inc + +include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER)-$(BUILDCLASS).inc diff --git a/externals/grill/flext/buildsys/gnumake.inc b/externals/grill/flext/buildsys/gnumake.inc index 2a333040..31553e17 100644 --- a/externals/grill/flext/buildsys/gnumake.inc +++ b/externals/grill/flext/buildsys/gnumake.inc @@ -51,4 +51,8 @@ endif # SHARED # product name and folder
##############################################
+ifndef SRCDIR
+SRCDIR=.
+endif
+
OUTSUB=$(TARGETMODE)-$(TARGETTYPE)
diff --git a/externals/grill/flext/buildsys/gnumake.mak b/externals/grill/flext/buildsys/gnumake.mak index 4d201957..8ff71f97 100644 --- a/externals/grill/flext/buildsys/gnumake.mak +++ b/externals/grill/flext/buildsys/gnumake.mak @@ -12,7 +12,9 @@ ifndef PKGINFO PKGINFO=package.txt endif +ifneq ($(PKGINFO),) include $(PKGINFO) +endif ############################################### # check variables @@ -31,13 +33,13 @@ endif ############################## -ifndef TARGETMODE - TARGETMODE=$(BUILDMODE) -endif +#ifndef TARGETMODE +#TARGETMODE=$(BUILDMODE) +#endif -ifndef TARGETTYPE - TARGETTYPE=$(BUILDTYPE) -endif +#ifndef TARGETTYPE +#TARGETTYPE=$(BUILDTYPE) +#endif ############################################### diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc index 5b58e659..e2c15730 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc @@ -1,41 +1,42 @@ -# build class specific settings
-
-INCPATH += -I$(FLEXTINC)
-LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
-LIBS += -l$(FLEXTNAME)
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
- touch $@
-
-$(TARGETPATH):
- mkdir -p $@
-
-$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGETPATH)/%.o : $(SRCDIR)/%.c
- $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGET):: $(TARGETPATH)
-
-$(TARGET):: $(COBJS) $(CPPOBJS)
- $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
- chmod 755 $@
-
-##############################################
-
-_clean_:
- rm $(COBJS) $(CPPOBJS) $(TARGET)
-
-##############################################
-
-$(INSTPATH):
- -mkdir -p $@
-
-_install_: $(INSTPATH)
- install $(TARGET) $(INSTPATH)
+# build class specific settings + +INCPATH += -I$(FLEXTINC) +LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) +LIBS += -l$(FLEXTNAME) + +############################################## + +# default target +_build_: $(TARGET) + +$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) + touch $@ + +$(TARGETPATH): + mkdir -p $@ + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET):: $(TARGETPATH) + +$(TARGET):: $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + chmod 755 $@ + strip --strip-unneeded $@ + +############################################## + +_clean_: + rm $(COBJS) $(CPPOBJS) $(TARGET) + +############################################## + +$(INSTPATH): + -mkdir -p $@ + +_install_: $(INSTPATH) + install $(TARGET) $(INSTPATH) diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc index 9b22d67c..ec55d6b8 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc @@ -1,51 +1,52 @@ -# build class specific settings
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
- touch $@
-
-$(TARGETPATH):
- -mkdir -p $@
-
-$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGETPATH)/%.o : $(SRCDIR)/%.c
- $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGET) :: $(TARGETPATH)
-
-$(TARGET) :: $(COBJS) $(CPPOBJS)
-ifdef SHARED
- $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
- chmod 755 $@
-else
- $(AR) rc $@ $(COBJS) $(CPPOBJS)
-endif
-
-##############################################
-
-_clean_:
- rm $(COBJS) $(CPPOBJS) $(TARGET)
-
-##############################################
-
-ifdef SHARED
-FLEXTLIBINST=$(FLEXTSHLIB)
-else
-FLEXTLIBINST=$(FLEXTLIB)
-endif
-
-$(FLEXTINC):
- -mkdir -p $@
-
-$(FLEXTLIBINST):
- -mkdir -p $@
-
-_install_: $(FLEXTINC) $(FLEXTLIBINST)
- install $(TARGET) $(FLEXTLIBINST)
- install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
+# build class specific settings + +############################################## + +# default target +_build_: $(TARGET) + +$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) + touch $@ + +$(TARGETPATH): + -mkdir -p $@ + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(COBJS) $(CPPOBJS) +ifdef SHARED + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + chmod 755 $@ + strip --strip-unneeded $@ +else + $(AR) rc $@ $(COBJS) $(CPPOBJS) +endif + +############################################## + +_clean_: + rm $(COBJS) $(CPPOBJS) $(TARGET) + +############################################## + +ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +else +FLEXTLIBINST=$(FLEXTLIB) +endif + +$(FLEXTINC): + -mkdir -p $@ + +$(FLEXTLIBINST): + -mkdir -p $@ + +_install_: $(FLEXTINC) $(FLEXTLIBINST) + install $(TARGET) $(FLEXTLIBINST) + install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc index f1eb6452..55022c36 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc @@ -1,11 +1,12 @@ ############################################## -TARGETPATH=$(OUTPATH)/$(OUTSUB) +OBJPATH=$(OUTPATH)/$(OUTSUB) +TARGETPATH=$(OBJPATH) TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) ############################################## -LDFLAGS += -shared -Wl,-x +LDFLAGS += -shared ############################################## diff --git a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def index a8f230a8..c58ab238 100644 --- a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def +++ b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def @@ -24,4 +24,6 @@ INSTPATH=/usr/local/lib/pd/extra # user defined compiler flags # (check if they match your system!) -OFLAGS=-O2 -march=pentium4 -msse +OFLAGS=-O2 +# optimizations for Pentium 4 +#OFLAGS+=-march=pentium4 -msse diff --git a/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-ext.inc index 042ce60f..88feb249 100644 --- a/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-ext.inc +++ b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-ext.inc @@ -1 +1 @@ -EXT=pd_linux
+EXT=pd_linux diff --git a/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-flext.inc index b64ecc11..cecaa37a 100644 --- a/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-flext.inc +++ b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-flext.inc @@ -1,6 +1,6 @@ -ifdef SHARED
-EXT=so
-else
-EXT=a
-endif
-
+ifdef SHARED +EXT=so +else +EXT=a +endif + diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc index 66a86234..b5873d50 100644 --- a/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc +++ b/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc @@ -1,70 +1,70 @@ -# build class specific settings
-
-INCPATH += -I$(FLEXTINC)
-LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
-LIBS += -l$(FLEXTNAME)
-
-# obviously header precompilation os still buggy with gcc 3.3
-
-ifdef PRECOMPILE
-#PRECOMSRC=$(SRCDIR)/$(PRECOMPILE)
-else
-#PRECOMSRC=$(FLEXTINC)/flext.h
-endif
-ifdef PRECOMSRC
-PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch
-PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC))
-endif
-
-##############################################
-
-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)
-
-$(PRECOMDST) : $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS))
- $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@
-
-$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@
-
-$(OBJPATH)/%.o : $(SRCDIR)/%.c
- $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGET) :: $(OBJPATH) $(TARGETPATH)
-
-$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS)
- $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
- chmod 755 $@
-
-##############################################
-
-_clean_:
- -rm -r $(TARGETPATH)
- -rm -r $(OBJPATH)
-
-##############################################
-
-# Attention: $@ doesn't work for paths with spaces....
-$(INSTPATH):
- -mkdir -p $(INSTPATH)
-
-_install_:: $(INSTPATH)
- cp -R $(INSTTARGET) $(INSTPATH)
+# build class specific settings + +INCPATH += -I$(FLEXTINC) +LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) +LIBS += -l$(FLEXTNAME) + +# obviously header precompilation os still buggy with gcc 3.3 + +ifdef PRECOMPILE +#PRECOMSRC=$(SRCDIR)/$(PRECOMPILE) +else +#PRECOMSRC=$(FLEXTINC)/flext.h +endif +ifdef PRECOMSRC +PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch +PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC)) +endif + +############################################## + +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) + +$(PRECOMDST) : $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS)) + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@ + +$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@ + +$(OBJPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(OBJPATH) $(TARGETPATH) + +$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + chmod 755 $@ + +############################################## + +_clean_: + -rm -r $(TARGETPATH) + -rm -r $(OBJPATH) + +############################################## + +# Attention: $@ doesn't work for paths with spaces.... +$(INSTPATH): + -mkdir -p $(INSTPATH) + +_install_:: $(INSTPATH) + 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 index b7c0ef8e..44b6f6fe 100644 --- a/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc +++ b/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc @@ -1,77 +1,77 @@ -# build class specific settings
-
-ifdef SHARED
-#LDFLAGS += -dylib_install_name $(FLEXTSHLIB)/$(OUTNAME).$(EXT)
-endif
-
-##############################################
-
-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 $@
-
-$(OBJPATH):
- -mkdir -p $@
-
-$(TARGETPATH):
- -mkdir -p $@
-
-ifdef PRECOMPILE
-PRECOMSRC=$(SRCDIR)/$(PRECOMPILE)
-PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch
-PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC))
-endif
-
-$(PRECOMDST): $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS))
- $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@
-
-$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@
-
-$(OBJPATH)/%.o : $(SRCDIR)/%.c
- $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGET) :: $(OBJPATH) $(TARGETPATH)
-
-$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS)
-ifdef SHARED
- $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
- chmod 755 $@
-else
- libtool -static -o $@ $(COBJS) $(CPPOBJS)
-endif
-
-##############################################
-
-_clean_:
- -rm -r $(TARGETPATH)
- -rm -r $(OBJPATH)
-
-##############################################
-
-ifdef SHARED
-FLEXTLIBINST=$(FLEXTSHLIB)
-else
-FLEXTLIBINST=$(FLEXTLIB)
-endif
-
-$(FLEXTINC):
- -mkdir -p $@
-
-$(FLEXTLIBINST):
- -mkdir -p $@
-
-_install_: $(FLEXTINC) $(FLEXTLIBINST)
- install $(TARGET) $(FLEXTLIBINST)
-ifndef SHARED
-# have to rerun ranlib at install dir ?!
- ranlib $(FLEXTLIBINST)/$(notdir $(TARGET))
-endif
- install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
+# build class specific settings + +ifdef SHARED +#LDFLAGS += -dylib_install_name $(FLEXTSHLIB)/$(OUTNAME).$(EXT) +endif + +############################################## + +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 $@ + +$(OBJPATH): + -mkdir -p $@ + +$(TARGETPATH): + -mkdir -p $@ + +ifdef PRECOMPILE +PRECOMSRC=$(SRCDIR)/$(PRECOMPILE) +PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch +PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC)) +endif + +$(PRECOMDST): $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS)) + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@ + +$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@ + +$(OBJPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(OBJPATH) $(TARGETPATH) + +$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS) +ifdef SHARED + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + chmod 755 $@ +else + libtool -static -o $@ $(COBJS) $(CPPOBJS) +endif + +############################################## + +_clean_: + -rm -r $(TARGETPATH) + -rm -r $(OBJPATH) + +############################################## + +ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +else +FLEXTLIBINST=$(FLEXTLIB) +endif + +$(FLEXTINC): + -mkdir -p $@ + +$(FLEXTLIBINST): + -mkdir -p $@ + +_install_: $(FLEXTINC) $(FLEXTLIBINST) + install $(TARGET) $(FLEXTLIBINST) +ifndef SHARED +# have to rerun ranlib at install dir ?! + ranlib $(FLEXTLIBINST)/$(notdir $(TARGET)) +endif + install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) diff --git a/externals/grill/flext/buildsys/mac/max/config-gcc.def b/externals/grill/flext/buildsys/mac/max/config-gcc.def index de6c6632..7f85903a 100644 --- a/externals/grill/flext/buildsys/mac/max/config-gcc.def +++ b/externals/grill/flext/buildsys/mac/max/config-gcc.def @@ -1,6 +1,6 @@ # where are the Max/MSP SDK header files? # you should have the latest version! -MAXSDKPATH=/Volumes/Daten/Prog/MaxMSP-SDK/4.5\ headers/c74support +MAXSDKPATH=/Applications/MaxMSP\ 4.5/MaxMSP-SDK/4.5\ headers/c74support ############################################################### @@ -21,8 +21,16 @@ 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.5/max-help/flext + ############################################################### # user defined compiler flags # (check if they match your system!) -OFLAGS=-O2 -mcpu=G4 -malign-natural -maltivec -faltivec +OFLAGS=-O2 +# optimizations for G4 +#OFLAGS += -mcpu=G4 -malign-natural -maltivec -faltivec diff --git a/externals/grill/flext/buildsys/mac/pd/config-gcc.def b/externals/grill/flext/buildsys/mac/pd/config-gcc.def index 85a9d8bd..19198e92 100644 --- a/externals/grill/flext/buildsys/mac/pd/config-gcc.def +++ b/externals/grill/flext/buildsys/mac/pd/config-gcc.def @@ -1,5 +1,5 @@ # where is the PD installation including source code? -PDPATH=/Applications/audio/Pd-0.38-0test13.app/Contents/Resources +PDPATH=/Applications/audio/Pd-0.38-0.app/Contents/Resources # where is the PD executable? PDBIN=$(PDPATH)/bin/pd @@ -27,4 +27,6 @@ INSTPATH=$(PDPATH)/extra # user defined compiler flags # (check if they match your system!) -OFLAGS=-O2 -mcpu=G4 -malign-natural -maltivec -faltivec +OFLAGS=-O2 +# optimizations for G4 +#OFLAGS += -mcpu=G4 -malign-natural -maltivec -faltivec diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc index 90b71f03..39ab2964 100644 --- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc +++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc @@ -1,3 +1,3 @@ -EXT=pd_darwin
+EXT=pd_darwin LDFLAGS += -bundle -bundle_loader $(PDBIN) diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc index 7aa9b3b5..17d6540d 100644 --- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc +++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc @@ -1,7 +1,7 @@ -ifdef SHARED
-EXT=dylib
-else
-EXT=a
-endif
+ifdef SHARED +EXT=dylib +else +EXT=a +endif LDFLAGS += -dynamiclib -flat_namespace -undefined suppress diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc index f00d0569..b57e87c2 100644 --- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc +++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc @@ -8,3 +8,5 @@ LIBPATH += -L$(PDPATH)/bin OBJPATH=$(OUTPATH)/$(OUTSUB) TARGETPATH=$(OBJPATH) TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) +INSTTARGET=$(TARGET) + diff --git a/externals/grill/flext/buildsys/nmake-sub.mak b/externals/grill/flext/buildsys/nmake-sub.mak index 1a69cbab..854e72de 100644 --- a/externals/grill/flext/buildsys/nmake-sub.mak +++ b/externals/grill/flext/buildsys/nmake-sub.mak @@ -18,44 +18,22 @@ !endif ############################## - -!ifndef TARGETMODE -!ifdef DEBUG -TARGETMODE=debug -!else -TARGETMODE=release -!endif -!endif - -!ifndef TARGETTYPE -!ifdef SHARED -TARGETTYPE=shared -!else -!ifdef THREADED -TARGETTYPE=multi -!else -TARGETTYPE=single -!endif -!endif -!endif - -############################## # flext-specific definitions -!include $(BUILDPATH)nmake-$(BUILDCLASS).inc - !include $(BUILDPATH)nmake.inc +!include $(BUILDPATH)nmake-$(BUILDCLASS).inc + ############################## # platform-specific make stuff -!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER)-$(BUILDCLASS).inc - !include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER).inc +!include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER)-$(BUILDCLASS).inc + ############################## # general make stuff -!include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER)-$(BUILDCLASS).inc - !include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER).inc + +!include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER)-$(BUILDCLASS).inc diff --git a/externals/grill/flext/buildsys/nmake.inc b/externals/grill/flext/buildsys/nmake.inc index 71c4c096..3f275b8f 100644 --- a/externals/grill/flext/buildsys/nmake.inc +++ b/externals/grill/flext/buildsys/nmake.inc @@ -49,4 +49,8 @@ FLEXTNAME=flext-$(RTSYS)_s # product name and folder
##############################################
+!ifndef SRCDIR
+SRCDIR=.
+!endif
+
OUTSUB=$(TARGETMODE)-$(TARGETTYPE)
diff --git a/externals/grill/flext/buildsys/nmake.mak b/externals/grill/flext/buildsys/nmake.mak index 78bd0ec0..5772d5a9 100644 --- a/externals/grill/flext/buildsys/nmake.mak +++ b/externals/grill/flext/buildsys/nmake.mak @@ -12,7 +12,9 @@ PKGINFO=package.txt !endif +!if "$(PKGINFO)" != "" !include $(PKGINFO) +!endif ############################################### # check variables @@ -31,13 +33,13 @@ BUILDTYPE=single ############################## -!ifndef TARGETMODE -TARGETMODE=$(BUILDMODE) -!endif +#!ifndef TARGETMODE +#TARGETMODE=$(BUILDMODE) +#!endif -!ifndef TARGETTYPE -TARGETTYPE=$(BUILDTYPE) -!endif +#!ifndef TARGETTYPE +#TARGETTYPE=$(BUILDTYPE) +#!endif ############################################### diff --git a/externals/grill/flext/buildsys/readme.txt b/externals/grill/flext/buildsys/readme.txt new file mode 100644 index 00000000..f1a93363 --- /dev/null +++ b/externals/grill/flext/buildsys/readme.txt @@ -0,0 +1,176 @@ +flext - C++ layer for Max/MSP and pd (pure data) externals
+
+Copyright (c) 2001-2005 Thomas Grill (gr@grrrr.org)
+For information on usage and redistribution, and for a DISCLAIMER OF ALL
+WARRANTIES, see the file, "license.txt," in this distribution.
+
+----------------------------------------------------------------------------
+
+At the moment this is more like a sketchboard, but i'll promise to bring some
+order into it some fine day in the not too distant future.
+
+----------------------------------------------------------------------------
+
+Build scripts
+=============
+
+Depending on platform the build process is run with
+build.sh
+or
+build.bat
+
+
+Arguments: PLATFORM SYSTEM COMPILER {TARGET} {definitions}
+
+PLATFORM: win / lnx / mac
+SYSTEM: pd / max
+COMPILER: msvc / gcc / mingw / cygwin / bcc / icc
+
+TARGET: (default is all)
+ all, build - build package in default style
+ install - install package
+ clean - clean build products
+
+ config - test if configuration needs refreshing
+
+or
+ build-MODE-TYPE
+ install-MODE-TYPE
+ clean-MODE-TYPE
+
+with
+ MODE: default, all, release, debug
+ TYPE: default, all, single, multi, shared
+
+
+Additional definitions can be passed to the make program
+like
+ "PKGINFO=info.txt" (defines new filename for package information)
+or
+ "PKGINFO=" (package information will be skipped - only for config target)
+
+For more macro names, see below
+
+
+For each of the supported combinations of PLATFORM, SYSTEM and COMPILER
+a MAKE program has been chosen, normally the one that comes with the compiler.
+
+For gcc it is GNU make (gnumake)
+For msvc it is Microsoft make (nmake)
+For bcc it is Borland make (bmake)
+
+
+
+Package info (package.txt)
+==========================
+
+Package information contains vital information for the build process.
+Obligatory are only:
+
+NAME: resulting filename of the build product
+SRCS: list of source files
+
+
+Normally also used are:
+
+HDRS: used header files, which SRCS files are dependent upon
+SRCDIR: source folder (relative to project folder), default is .
+
+
+Other settings:
+
+PRECOMPILE: prefix header file (in SRCDIR) for all source files,
+ will be precompiled if supported by the compiler
+
+BUILDCLASS: can currently be flext or ext, default is ext.
+ flext will build the flext system
+ ext will build a flext-based external
+
+BUILDMODE: release or debug, default is release
+ if release, optimization flags will be used
+ if debug, debug information will be generated
+
+BUILDTYPE: single, multi or shared, default is single
+ if single, it will be linked against the single-threaded static flext library
+ if multi, it will be linked against the multi-threaded static flext library
+ if shared, it will be linked against the shared flext library
+
+BUILDDIR: relative folder with additional build settings
+
+
+
+Additional build settings (BUILDDIR)
+====================================
+
+If BUILDDIR is defined, all PLATFORM-SYSTEM-COMPILER combinations to support
+must are mirrored by the respective .def and .inc files in the BUILDDIR.
+
+
+config-PLATFORM.def files (e.g. config-lnx.def) :
+
+ These files can contain additional macro definitions, that are private
+ to the project.
+ The definitions should be strictly in the form SETTING=value, without any
+ make-specific macros etc.
+ The .def files work as templates that get copied to a user-editable
+ config.txt file when the build process is first started.
+
+
+MAKE-PLATFORM-COMPILER.inc files
+(e.g. gnumake-lnx-gcc.inc or nmake-win-msvc.inc):
+
+ These files (which are no considered to be edited by the user) can contain
+ specific modifications to compiler flags, include file paths etc.
+
+ For gnumake this would e.g. be
+ INCPATH += -I/usr/local/include/python2.3
+
+ for nmake or bmake e.g.
+ INCPATH = $(INCPATH) -I"c:\program files\Python2.3\include"
+
+
+Structure of build system
+=========================
+
+The build system has several levels of information, which are evaluated in the
+following order (see also buildsys/MAKE-sub.mak)
+
+Project level:
+- PKGINFO file (e.g. package.txt)
+- USRCONFIG file (e.g. config.txt)
+- USRMAKE file (e.g. build/gnumake-lnx-gcc.inc)
+
+General definitions (in buildsys):
+
+- MAKE.inc (e.g. buildsys/gnumake.inc)
+ contains evaluation of flext library name, build directory etc.
+- MAKE-BUILDCLASS.inc (e.g. buildsys/gnumake-ext.inc)
+ contains some more flag settings
+
+Real-time-system-dependent definitions (in buildsys/PLATFORM/SYSTEM):
+
+- MAKE-COMPILER.inc (e.g. buildsys/lnx/pd/gnumake-gcc.inc)
+ contains general real-time-system dependent info (e.g. paths, FLEXT_SYS setting)
+- MAKE-COMPILER-BUILDCLASS.inc (e.g. buildsys/lnx/pd/gnumake-gcc-ext.inc)
+ contains specific real-time-system dependent info (e.g. extension of binary)
+
+Platform-dependent definitions (in buildsys/PLATFORM):
+
+- MAKE-COMPILER.inc (e.g. buildsys/lnx/gnumake-gcc.inc)
+ contains general platform-specific flags
+- MAKE-COMPILER-BUILDCLASS.inc (e.g. buildsys/lnx/gnumake-gcc-ext.inc)
+ contains the actual make targets (_build_,_clean_ and _install_)
+
+
+Macro names
+===============
+
+PKGINFO - filename for package information (must reside in project folder)
+
+CFLAGS - compiler flags
+LDFLAGS - linker flags
+
+INCPATH - include file path (must come with e.g. -I )
+LIBPATH - library path (must come with e.g. -L )
+
+LIBS - libraries to link in (must come with e.g. -l )
diff --git a/externals/grill/flext/buildsys/targets-ext.inc b/externals/grill/flext/buildsys/targets-ext.inc index e69de29b..afab3086 100644 --- a/externals/grill/flext/buildsys/targets-ext.inc +++ b/externals/grill/flext/buildsys/targets-ext.inc @@ -0,0 +1,49 @@ +build-default-default: build-$(BUILDMODE)-$(BUILDTYPE)
+
+build-all-default: build-all-$(BUILDTYPE)
+
+build-release-default: build-release-$(BUILDTYPE)
+
+build-debug-default: build-debug-$(BUILDTYPE)
+
+build-default-all: build-$(BUILDMODE)-all
+
+build-default-single: build-$(BUILDMODE)-single
+
+build-default-multi: build-$(BUILDMODE)-multi
+
+build-default-shared: build-$(BUILDMODE)-shared
+
+
+install-default-default: install-$(BUILDMODE)-$(BUILDTYPE)
+
+install-all-default: install-all-$(BUILDTYPE)
+
+install-release-default: install-release-$(BUILDTYPE)
+
+install-debug-default: install-debug-$(BUILDTYPE)
+
+install-default-all: install-$(BUILDMODE)-all
+
+install-default-single: install-$(BUILDMODE)-single
+
+install-default-multi: install-$(BUILDMODE)-multi
+
+install-default-shared: install-$(BUILDMODE)-shared
+
+
+clean-default-default: clean-$(BUILDMODE)-$(BUILDTYPE)
+
+clean-all-default: clean-all-$(BUILDTYPE)
+
+clean-release-default: clean-release-$(BUILDTYPE)
+
+clean-debug-default: clean-debug-$(BUILDTYPE)
+
+clean-default-all: clean-$(BUILDMODE)-all
+
+clean-default-single: clean-$(BUILDMODE)-single
+
+clean-default-multi: clean-$(BUILDMODE)-multi
+
+clean-default-shared: clean-$(BUILDMODE)-shared
diff --git a/externals/grill/flext/buildsys/targets-flext.inc b/externals/grill/flext/buildsys/targets-flext.inc index 6cf8208d..e16f2b86 100644 --- a/externals/grill/flext/buildsys/targets-flext.inc +++ b/externals/grill/flext/buildsys/targets-flext.inc @@ -1,29 +1,50 @@ build-default-default: build-all-all
+build-all-default: build-all-all
+
+build-release-default: build-release-all
+
+build-debug-default: build-debug-all
+
+build-default-all: build-all-all
+
+build-default-single: build-all-single
+
+build-default-multi: build-all-multi
+
+build-default-shared: build-all-shared
+
+
install-default-default: install-all-all
-clean-default-default: clean-all-all
+install-all-default: install-all-all
+
+install-release-default: install-release-all
+
+install-debug-default: install-debug-all
-###################################################
+install-default-all: install-all-all
-build-all-all: build-release-all build-debug-all
+install-default-single: install-all-single
-build-release-all: build-release-single build-release-multi build-release-shared
+install-default-multi: install-all-multi
-build-debug-all: build-debug-single build-debug-multi build-debug-shared
+install-default-shared: install-all-shared
+
+
+clean-default-default: clean-all-all
-###################################################
+clean-all-default: clean-all-all
-install-all-all: install-release-all install-debug-all
+clean-release-default: clean-release-all
-install-release-all: install-release-single install-release-multi install-release-shared
+clean-debug-default: clean-debug-all
-install-debug-all: install-debug-single install-debug-multi install-debug-shared
+clean-default-all: clean-all-all
-###################################################
+clean-default-single: clean-all-single
-clean-all-all: clean-release-all clean-debug-all
+clean-default-multi: clean-all-multi
-clean-release-all: clean-release-single clean-release-multi clean-release-shared
+clean-default-shared: clean-all-shared
-clean-debug-all: clean-debug-single clean-debug-multi clean-debug-shared
diff --git a/externals/grill/flext/buildsys/targets.inc b/externals/grill/flext/buildsys/targets.inc index 0372392c..86cd3add 100644 --- a/externals/grill/flext/buildsys/targets.inc +++ b/externals/grill/flext/buildsys/targets.inc @@ -6,71 +6,105 @@ install: install-default-default ###########################################################
-build-default-default: build-$(TARGETMODE)-$(TARGETTYPE)
+build-all-all: build-release-all build-debug-all
-install-default-default: install-$(TARGETMODE)-$(TARGETTYPE)
+build-release-all: build-release-single build-release-multi build-release-shared
-clean-default-default: clean-$(TARGETMODE)-$(TARGETTYPE)
+build-debug-all: build-debug-single build-debug-multi build-debug-shared
+
+build-all-single: build-release-single build-debug-single
+
+build-all-multi: build-release-multi build-debug-multi
+
+build-all-shared: build-release-shared build-debug-shared
+
+###################################################
+
+install-all-all: install-release-all install-debug-all
+
+install-release-all: install-release-single install-release-multi install-release-shared
+
+install-debug-all: install-debug-single install-debug-multi install-debug-shared
+
+install-all-single: install-release-single install-debug-single
+
+install-all-multi: install-release-multi install-debug-multi
+
+install-all-shared: install-release-shared install-debug-shared
+
+###################################################
+
+clean-all-all: clean-release-all clean-debug-all
+
+clean-release-all: clean-release-single clean-release-multi clean-release-shared
+
+clean-debug-all: clean-debug-single clean-debug-multi clean-debug-shared
+
+clean-all-single: clean-release-single clean-debug-single
+
+clean-all-multi: clean-release-multi clean-debug-multi
+
+clean-all-shared: clean-release-shared clean-debug-shared
###########################################################
build-release-single: config
- $(MAKE) $(OPTIONS) _build_
+ $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=single _build_
build-debug-single: config
- $(MAKE) $(OPTIONS) DEBUG=1 _build_
+ $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _build_
build-release-multi: config
- $(MAKE) $(OPTIONS) THREADED=1 _build_
+ $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _build_
build-debug-multi: config
- $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _build_
+ $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _build_
build-release-shared: config
- $(MAKE) $(OPTIONS) SHARED=1 _build_
+ $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _build_
build-debug-shared: config
- $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _build_
+ $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _build_
###########################################################
-install-release-single:
- $(MAKE) $(OPTIONS) _install_
+install-release-single: config
+ $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=single _install_
-install-debug-single:
- $(MAKE) $(OPTIONS) DEBUG=1 _install_
+install-debug-single: config
+ $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _install_
-install-release-multi:
- $(MAKE) $(OPTIONS) THREADED=1 _install_
+install-release-multi: config
+ $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _install_
-install-debug-multi:
- $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _install_
+install-debug-multi: config
+ $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _install_
-install-release-shared:
- $(MAKE) $(OPTIONS) SHARED=1 _install_
+install-release-shared: config
+ $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _install_
-install-debug-shared:
- $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _install_
+install-debug-shared: config
+ $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _install_
###########################################################
-clean-release-single:
- $(MAKE) $(OPTIONS) _clean_
+clean-release-single: config
+ $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=single _clean_
-clean-debug-single:
- $(MAKE) $(OPTIONS) DEBUG=1 _clean_
+clean-debug-single: config
+ $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _clean_
-clean-release-multi:
- $(MAKE) $(OPTIONS) THREADED=1 _clean_
+clean-release-multi: config
+ $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _clean_
-clean-debug-multi:
- $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _clean_
+clean-debug-multi: config
+ $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _clean_
-clean-release-shared:
- $(MAKE) $(OPTIONS) SHARED=1 _clean_
+clean-release-shared: config
+ $(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _clean_
-clean-debug-shared:
- $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _clean_
+clean-debug-shared: config
+ $(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _clean_
###########################################################
diff --git a/externals/grill/flext/buildsys/win/bmake-bcc-ext.inc b/externals/grill/flext/buildsys/win/bmake-bcc-ext.inc index 3a61d1be..ff26dc12 100644 --- a/externals/grill/flext/buildsys/win/bmake-bcc-ext.inc +++ b/externals/grill/flext/buildsys/win/bmake-bcc-ext.inc @@ -1,54 +1,53 @@ -# build class specific settings
-
-INCPATH=$(INCPATH) -I$(FLEXTINC)
-LIBPATH=$(LIBPATH) -L$(FLEXTLIB)
-LIBS=$(LIBS) $(FLEXTNAME).lib
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-$(OUTPATH):
- if not exist $@ mkdir $@ > nul
-
-$(TARGETPATH): $(OUTPATH)
- if not exist $@ mkdir $@ > nul
-
-SETUPFUNCTION=$(NAME)_setup
-
-$(TARGETPATH)\$(NAME).def: $(TARGETPATH)
- @echo EXPORTS $(SETUPFUNCTION) = _$(SETUPFUNCTION) > $@
-# this next line fixes a strange problem with implib - lacking underscore?!
- @echo IMPORTS _rtext_retext=PD.rtext_retext >> $@
-
-$(TARGET) :: $(TARGETPATH)\$(NAME).def
-
-{$(SRCDIR)}.cpp{}.obj:
- bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $<
-
-{$(SRCDIR)}.c{}.obj:
- bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $<
-
-$(TARGET) :: $(TARGETPATH)
-
-$(TARGET) :: $(OBJS)
- @cd $(TARGETPATH)
- ilink32 $(LDFLAGS) $(LIBPATH) -L. $(OBJS) ,$(<F),,$(LIBS),$(NAME).def
- @cd ..\..
-
-##############################################
-# remove build
-
-_clean_:
- -del /q $(TARGET) > nul
- -cd $(TARGETPATH)
- -del /q $(OBJS) > nul
-
-##############################################
-
-$(INSTPATH):
- if not exist $@ mkdir $@ > nul
-
-_install_: $(INSTPATH)
- copy $(TARGET) $(INSTPATH) > nul
+# build class specific settings + +INCPATH=$(INCPATH) -I$(FLEXTINC) +LIBPATH=$(LIBPATH) -L$(FLEXTLIB) +LIBS=$(LIBS) $(FLEXTNAME).lib + +############################################## + +# default target +_build_: $(TARGET) + +$(OUTPATH): + if not exist $@ mkdir $@ > nul + +$(TARGETPATH): $(OUTPATH) + if not exist $@ mkdir $@ > nul + +SETUPFUNCTION=$(NAME)_setup + +$(TARGETPATH)\$(NAME).def: $(TARGETPATH) + @echo EXPORTS $(SETUPFUNCTION) = _$(SETUPFUNCTION) > $@ +# this next line fixes a strange problem with implib - lacking underscore?! + @echo IMPORTS _rtext_retext=PD.rtext_retext >> $@ + +$(TARGET) :: $(TARGETPATH)\$(NAME).def + +{$(SRCDIR)}.cpp{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< + +{$(SRCDIR)}.c{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(OBJS) + @cd $(TARGETPATH) + ilink32 $(LDFLAGS) $(LIBPATH) -L. $(OBJS) ,$(<F),,$(LIBS),$(NAME).def + @cd ..\.. + +############################################## +# remove build + +_clean_: + -del /q $(TARGETPATH)\*.* > nul + -rmdir /q $(TARGETPATH) > nul + +############################################## + +$(INSTPATH): + if not exist $@ mkdir $@ > nul + +_install_: $(INSTPATH) + copy $(TARGET) $(INSTPATH) > nul diff --git a/externals/grill/flext/buildsys/win/bmake-bcc-flext.inc b/externals/grill/flext/buildsys/win/bmake-bcc-flext.inc index a0486cf6..8dfb224e 100644 --- a/externals/grill/flext/buildsys/win/bmake-bcc-flext.inc +++ b/externals/grill/flext/buildsys/win/bmake-bcc-flext.inc @@ -1,84 +1,70 @@ -# build class specific settings
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-$(OUTPATH):
- if not exist $@ mkdir $@ > nul
-
-$(TARGETPATH): $(OUTPATH)
- if not exist $@ mkdir $@ > nul
-
-{$(SRCDIR)}.cpp{}.obj:
- bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $<
-
-{$(SRCDIR)}.c{}.obj:
- bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $<
-
-
-$(TARGETPATH)\pd.lib : $(PDPATH)\bin\pd.dll
- implib -a $< $**
-
-$(TARGETPATH)\pthreadVC.lib : $(PDPATH)\bin\pthreadVC.dll
- implib -a $< $**
-
-PDTARGETS=$(TARGETPATH)\pd.lib $(TARGETPATH)\pthreadVC.lib
-
-
-$(TARGET) :: $(TARGETPATH) $(PDTARGETS)
-
-$(TARGET) :: $(OBJS)
- @cd $(TARGETPATH)
-!ifdef SHARED
- ilink32 $(LDFLAGS) $(LIBPATH) -L. $(OBJS) ,$(<F),,$(LIBS)
- implib -a $(<B).lib $(<F)
-!else
- -del $(<F)
- tlib "$(<F)" +$(OBJS: = +)
-!endif
- @cd ..\..
-
-##############################################
-
-_clean_:
- -del /q $(TARGET) > nul
- -cd $(TARGETPATH)
- -del /q $(OBJS) > nul
-
-##############################################
-
-!ifdef SHARED
-FLEXTLIBINST=$(FLEXTSHLIB)
-!else
-FLEXTLIBINST=$(FLEXTLIB)
-!endif
-
-$(FLEXTINC):
- if not exist $@ mkdir $@ > nul
-
-!if "$(FLEXTINC)" != "$(FLEXTLIB)"
-$(FLEXTLIB):
- if not exist $@ mkdir $@ > nul
-
-_install_:: $(FLEXTLIB)
-!endif
-
-!if "$(FLEXTLIBINST)" != "$(FLEXTLIB)" && "$(FLEXTLIBINST)" != "$(FLEXTINC)"
-$(FLEXTLIBINST):
- if not exist $@ mkdir $@ > nul
-
-_install_:: $(FLEXTLIBINST)
-!endif
-
-_install_:: $(FLEXTINC)
- copy $(TARGET) $(FLEXTLIBINST) > nul
-!ifdef SHARED
-# copy import library
- copy $(TARGET:.dll=.lib) $(FLEXTLIB) > nul
-!endif
-# copy headers
- for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(FLEXTINC) > nul
-# copy import libraries
- for %%i in ($(PDTARGETS)) do @copy %%i $(FLEXTLIBINST) > nul
+# build class specific settings + +############################################## + +# default target +_build_: $(TARGET) + +$(OUTPATH): + if not exist $@ mkdir $@ > nul + +$(TARGETPATH): $(OUTPATH) + if not exist $@ mkdir $@ > nul + +{$(SRCDIR)}.cpp{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< + +{$(SRCDIR)}.c{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(TARGETPATH) $< + + +$(TARGETPATH)\pd.lib : $(PDPATH)\bin\pd.dll + implib -a $< $** + +$(TARGETPATH)\pthreadVC.lib : $(PDPATH)\bin\pthreadVC.dll + implib -a $< $** + +PDTARGETS=$(TARGETPATH)\pd.lib $(TARGETPATH)\pthreadVC.lib + + +$(TARGET) :: $(TARGETPATH) $(PDTARGETS) + +$(TARGET) :: $(OBJS) + @cd $(TARGETPATH) +!ifdef SHARED + ilink32 $(LDFLAGS) $(LIBPATH) -L. $(OBJS) ,$(<F),,$(LIBS) + implib -a $(<B).lib $(<F) +!else + -del $(<F) + tlib "$(<F)" +$(OBJS: = +) +!endif + @cd ..\.. + +############################################## + +_clean_: + -del /q $(TARGETPATH)\*.* > nul + -rmdir /q $(TARGETPATH) > nul + +############################################## + +!ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +!else +FLEXTLIBINST=$(FLEXTLIB) +!endif + +_install_: + @if not exist $@ mkdir $(FLEXTINC) > nul + @if not exist $@ mkdir $(FLEXTLIB) > nul + @if not exist $@ mkdir $(FLEXTLIBINST) > nul + + copy $(TARGET) $(FLEXTLIBINST) > nul +!ifdef SHARED +# copy import library + copy $(TARGET:.dll=.lib) $(FLEXTLIB) > nul +!endif +# copy headers + for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(FLEXTINC) > nul +# copy import libraries + for %%i in ($(PDTARGETS)) do @copy %%i $(FLEXTLIB) > nul diff --git a/externals/grill/flext/buildsys/win/bmake-bcc.inc b/externals/grill/flext/buildsys/win/bmake-bcc.inc index dc9d6ae1..e852ea9a 100644 --- a/externals/grill/flext/buildsys/win/bmake-bcc.inc +++ b/externals/grill/flext/buildsys/win/bmake-bcc.inc @@ -1,41 +1,42 @@ -!ifdef BCCPATH
-INCPATH=$(INCPATH) -I$(BCCPATH)\include
-LIBPATH=$(LIBPATH) -L$(BCCPATH)\lib
-!endif
-
-##############################################
-
-TARGETPATH=$(OUTPATH)\$(OUTSUB)
-TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT)
-
-##############################################
-# use precompiled headers
-
-!ifndef PRECOMPILE
-CFLAGS=$(CFLAGS) -Hh=flext.h
-!else
-CFLAGS=$(CFLAGS) -Hh=$(PRECOMPILE)
-!endif
-# location of precompiled file
-CFLAGS=$(CFLAGS) -H=$(TARGETPATH)\precompiled.pch
-
-##############################################
-
-LIBS=$(LIBS) cw32.lib import32.lib C0D32.OBJ
-CFLAGS=$(CFLAGS) -tWD -tWM -w-8004 -w-8027 -w-8057
-LDFLAGS=$(LDFLAGS) /C /Tpd
-
-##############################################
-
-!ifdef DEBUG
-CFLAGS=$(CFLAGS) -v -D_DEBUG
-LDFLAGS=$(LDFLAGS) /v
-!else
-CFLAGS=$(CFLAGS) $(OFLAGS) -DNDEBUG
-!endif
-
-##############################################
-# convert both *.c and *.cpp
-
-OBJSTMP= $(SRCS:.c=.obj)
-OBJS= $(OBJSTMP:.objpp=.obj)
+!ifdef BCCPATH +INCPATH=$(INCPATH) -I$(BCCPATH)\include +LIBPATH=$(LIBPATH) -L$(BCCPATH)\lib +!endif + +############################################## + +OBJPATH=$(OUTPATH)\$(OUTSUB) +TARGETPATH=$(OBJPATH) +TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT) + +############################################## +# use precompiled headers + +!ifndef PRECOMPILE +CFLAGS=$(CFLAGS) -Hh=flext.h +!else +CFLAGS=$(CFLAGS) -Hh=$(PRECOMPILE) +!endif +# location of precompiled file +CFLAGS=$(CFLAGS) -H=$(OBJPATH)\precompiled.pch + +############################################## + +LIBS=$(LIBS) cw32.lib import32.lib C0D32.OBJ +CFLAGS=$(CFLAGS) -tWD -tWM -w-8004 -w-8027 -w-8057 +LDFLAGS=$(LDFLAGS) /C /Tpd + +############################################## + +!ifdef DEBUG +CFLAGS=$(CFLAGS) -v -D_DEBUG +LDFLAGS=$(LDFLAGS) /v +!else +CFLAGS=$(CFLAGS) $(OFLAGS) -DNDEBUG +!endif + +############################################## +# convert both *.c and *.cpp + +OBJSTMP= $(SRCS:.c=.obj) +OBJS= $(OBJSTMP:.objpp=.obj) diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc index 95b3125d..91eff1ed 100644 --- a/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc @@ -1,41 +1,42 @@ -# build class specific settings
-
-INCPATH += -I$(FLEXTINC)
-LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
-LIBS += -l$(FLEXTNAME)
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
- touch $@
-
-$(TARGETPATH):
- -mkdir -p $@
-
-$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGETPATH)/%.o : $(SRCDIR)/%.c
- $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGET) :: $(TARGETPATH)
-
-$(TARGET) :: $(COBJS) $(CPPOBJS)
- $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
- chmod 755 $@
-
-##############################################
-
-_clean_:
- rm $(COBJS) $(CPPOBJS) $(TARGET)
-
-##############################################
-
-$(INSTPATH):
- -mkdir -p $@
-
-_install_: $(INSTPATH)
- install $(TARGET) $(INSTPATH)
+# build class specific settings + +INCPATH += -I$(FLEXTINC) +LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) +LIBS += -l$(FLEXTNAME) + +############################################## + +# default target +_build_: $(TARGET) + +$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) + touch $@ + +$(TARGETPATH): + -mkdir -p $@ + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + strip --strip-unneeded $@ + chmod 755 $@ + +############################################## + +_clean_: + rm $(COBJS) $(CPPOBJS) $(TARGET) + +############################################## + +$(INSTPATH): + -mkdir -p $@ + +_install_: $(INSTPATH) + install $(TARGET) $(INSTPATH) diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc index 9b22d67c..ec55d6b8 100644 --- a/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc @@ -1,51 +1,52 @@ -# build class specific settings
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
- touch $@
-
-$(TARGETPATH):
- -mkdir -p $@
-
-$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGETPATH)/%.o : $(SRCDIR)/%.c
- $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGET) :: $(TARGETPATH)
-
-$(TARGET) :: $(COBJS) $(CPPOBJS)
-ifdef SHARED
- $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
- chmod 755 $@
-else
- $(AR) rc $@ $(COBJS) $(CPPOBJS)
-endif
-
-##############################################
-
-_clean_:
- rm $(COBJS) $(CPPOBJS) $(TARGET)
-
-##############################################
-
-ifdef SHARED
-FLEXTLIBINST=$(FLEXTSHLIB)
-else
-FLEXTLIBINST=$(FLEXTLIB)
-endif
-
-$(FLEXTINC):
- -mkdir -p $@
-
-$(FLEXTLIBINST):
- -mkdir -p $@
-
-_install_: $(FLEXTINC) $(FLEXTLIBINST)
- install $(TARGET) $(FLEXTLIBINST)
- install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
+# build class specific settings + +############################################## + +# default target +_build_: $(TARGET) + +$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) + touch $@ + +$(TARGETPATH): + -mkdir -p $@ + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(COBJS) $(CPPOBJS) +ifdef SHARED + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + chmod 755 $@ + strip --strip-unneeded $@ +else + $(AR) rc $@ $(COBJS) $(CPPOBJS) +endif + +############################################## + +_clean_: + rm $(COBJS) $(CPPOBJS) $(TARGET) + +############################################## + +ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +else +FLEXTLIBINST=$(FLEXTLIB) +endif + +$(FLEXTINC): + -mkdir -p $@ + +$(FLEXTLIBINST): + -mkdir -p $@ + +_install_: $(FLEXTINC) $(FLEXTLIBINST) + install $(TARGET) $(FLEXTLIBINST) + install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc index 73425e5d..55022c36 100644 --- a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc +++ b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc @@ -1,11 +1,12 @@ ############################################## -TARGETPATH=$(OUTPATH)/$(OUTSUB) +OBJPATH=$(OUTPATH)/$(OUTSUB) +TARGETPATH=$(OBJPATH) TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) ############################################## -LDFLAGS += -shared -Wl,-x +LDFLAGS += -shared ############################################## @@ -20,5 +21,5 @@ endif CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) -COBJS=$(patsubst %.c,$(TARGETPATH)/%.o,$(filter %.c,$(SRCS))) -CPPOBJS=$(patsubst %.cpp,$(TARGETPATH)/%.opp,$(filter %.cpp,$(SRCS))) +COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) +CPPOBJS=$(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc b/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc index 6932ae5c..f8eea4ac 100644 --- a/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc @@ -1,43 +1,50 @@ -# build class specific settings
-
-INCPATH += -I$(FLEXTINC)
-LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
-LIBS += -l$(FLEXTNAME)
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-#$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
-# touch $@
-
-$(OUTPATH):
- -mkdir $(subst /,\,$@)
-
-$(TARGETPATH): $(OUTPATH)
- -mkdir $(subst /,\,$@)
-
-$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGETPATH)/%.o : $(SRCDIR)/%.c
- $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGET) :: $(TARGETPATH)
-
-$(TARGET) :: $(COBJS) $(CPPOBJS)
- $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
-
-##############################################
-
-_clean_:
- -del $(subst /,\,$(COBJS) $(CPPOBJS) $(TARGET))
-
-##############################################
-
-$(INSTPATH):
- -mkdir $(subst /,\,$@)
-
-_install_: $(INSTPATH)
- copy $(subst /,\,$(TARGET) $(INSTPATH))
+# build class specific settings + +INCPATH += -I$(FLEXTINC) +LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) + +ifdef SHARED +LIBS += $(FLEXTSHLIB)/lib$(FLEXTNAME).dll +else +LIBS += -l$(FLEXTNAME) +endif + +############################################## + +# default target +_build_: $(TARGET) + +#$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) +# touch $@ + +$(OUTPATH): + -cmd /c "mkdir $(subst /,\,$@)" + +$(TARGETPATH): $(OUTPATH) + -cmd /c "mkdir $(subst /,\,$@)" + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + -strip --strip-unneeded $@ + +############################################## + +_clean_: + -cmd /c "del /q $(subst /,\,$(TARGETPATH)/*.*)" > nul + -cmd /c "rmdir /q $(subst /,\,$(TARGETPATH))" > nul + +############################################## + +$(INSTPATH): + -cmd /c "mkdir $(subst /,\,$@)" + +_install_: $(INSTPATH) + cmd /c "copy $(subst /,\,$(TARGET) $(INSTPATH))" diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc b/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc index 22a6bdfc..69b8afac 100644 --- a/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc @@ -1,55 +1,57 @@ -# build class specific settings
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-#$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
-# touch $@
-
-$(OUTPATH):
- -mkdir $(subst /,\,$@)
-
-$(TARGETPATH): $(OUTPATH)
- -mkdir $(subst /,\,$@)
-
-$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGETPATH)/%.o : $(SRCDIR)/%.c
- $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGET) :: $(TARGETPATH)
-
-$(TARGET) :: $(COBJS) $(CPPOBJS)
-ifdef SHARED
- $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
-else
- $(AR) rc $@ $(COBJS) $(CPPOBJS)
-endif
-
-##############################################
-
-_clean_:
- -del $(subst /,\,$(COBJS) $(CPPOBJS) $(TARGET))
-
-##############################################
-
-ifdef SHARED
-FLEXTLIBINST=$(FLEXTSHLIB)
-else
-FLEXTLIBINST=$(FLEXTLIB)
-endif
-
-$(FLEXTINC):
- -mkdir $(subst /,\,$@)
-
-$(FLEXTLIBINST):
- -mkdir $(subst /,\,$@)
-
-_install_:: $(FLEXTINC) $(FLEXTLIBINST)
-
-_install_::
- copy $(subst /,\,$(TARGET) $(FLEXTLIBINST))
- -for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(subst /,\,$(FLEXTPATH)) > nul
+# build class specific settings + +############################################## + +# default target +_build_: $(TARGET) + +#$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) +# touch $@ + +$(OUTPATH): + -cmd /c "mkdir $(subst /,\,$@)" + +$(TARGETPATH): $(OUTPATH) + -cmd /c "mkdir $(subst /,\,$@)" + +$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGETPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) :: $(TARGETPATH) + +$(TARGET) :: $(COBJS) $(CPPOBJS) +ifdef SHARED + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + -strip --strip-unneeded $@ +else + $(AR) rc $@ $(COBJS) $(CPPOBJS) +endif + +############################################## + +_clean_: + -cmd /c "del /q $(subst /,\,$(TARGETPATH)/*.*)" > nul + -cmd /c "rmdir /q $(subst /,\,$(TARGETPATH))" > nul + +############################################## + +ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +else +FLEXTLIBINST=$(FLEXTLIB) +endif + +$(FLEXTINC): + -cmd /c "mkdir $(subst /,\,$@)" + +$(FLEXTLIBINST): + -cmd /c "mkdir $(subst /,\,$@)" + +_install_:: $(FLEXTINC) $(FLEXTLIBINST) + +_install_:: + cmd /c "copy $(subst /,\,$(TARGET) $(FLEXTLIBINST))" + -cmd /c "for %i in ($(HDRS)) do @cmd /c copy $(SRCDIR)\%i $(subst /,\,$(FLEXTPATH))" > nul diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw.inc b/externals/grill/flext/buildsys/win/gnumake-mingw.inc index 7a8aab9c..d32f93e6 100644 --- a/externals/grill/flext/buildsys/win/gnumake-mingw.inc +++ b/externals/grill/flext/buildsys/win/gnumake-mingw.inc @@ -1,11 +1,12 @@ ############################################## -TARGETPATH=$(OUTPATH)\$(OUTSUB) +OBJPATH=$(OUTPATH)\$(OUTSUB) +TARGETPATH=$(OBJPATH) TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT) ############################################## -LDFLAGS += -shared -Wl,-x +LDFLAGS += -shared ############################################## @@ -20,5 +21,5 @@ endif CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) -COBJS=$(patsubst %.c,$(TARGETPATH)/%.o,$(filter %.c,$(SRCS))) -CPPOBJS=$(patsubst %.cpp,$(TARGETPATH)/%.opp,$(filter %.cpp,$(SRCS))) +COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) +CPPOBJS=$(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) diff --git a/externals/grill/flext/buildsys/win/max/config-mingw.def b/externals/grill/flext/buildsys/win/max/config-mingw.def index d0ce64fa..2727fce6 100644 --- a/externals/grill/flext/buildsys/win/max/config-mingw.def +++ b/externals/grill/flext/buildsys/win/max/config-mingw.def @@ -1,10 +1,6 @@ # where are the Max/MSP SDK header files? # you should have the latest version! -MAXSDKPATH="c:/data/prog/audio/maxmspsdk_win/4.5 headers/c74support" - -# where is MS VC++? -# (not necessary if the build is run with the compiler environment) -# MSVCPATH=C:/Programme/Microsoft Visual Studio .NET 2003/Vc7 +MAXSDKPATH="%ProgramFiles%\MaxMSP 4.5/maxmspsdk_win/4.5 headers/c74support" ############################################################### @@ -15,7 +11,8 @@ FLEXTINC="%CommonProgramFiles%/Cycling '74/flext" FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +# (a good place is the MaxMSP program folder) +FLEXTSHLIB="%ProgramFiles%\MaxMSP 4.5" ############################################################### @@ -26,8 +23,16 @@ OUTPATH=max-mingw # where should the external be installed? INSTPATH="%CommonProgramFiles%/Cycling '74/externals/flext" +# where should the initialization files be installed? +INITPATH="%CommonProgramFiles%/Cycling '74/init" + +# where should the help files be installed? +HELPPATH="%ProgramFiles%/MaxMSP 4.5/max-help/flext" + ############################################################### # some user-definable flags # (check if they match your system!) -OFLAGS=-O2 -march=pentium4 -msse +OFLAGS=-O2 +# optimizations for Pentium 4 +#OFLAGS += -march=pentium4 -msse diff --git a/externals/grill/flext/buildsys/win/max/config-msvc.def b/externals/grill/flext/buildsys/win/max/config-msvc.def index 1c849d32..f67b6b7f 100644 --- a/externals/grill/flext/buildsys/win/max/config-msvc.def +++ b/externals/grill/flext/buildsys/win/max/config-msvc.def @@ -1,10 +1,10 @@ # where are the Max/MSP SDK header files? # you should have the latest version! -MAXSDKPATH="c:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support" +MAXSDKPATH="%ProgramFiles%\MaxMSP 4.5\maxmspsdk_win\4.5 headers\c74support" # where is MS VC++? # (not necessary if the build is run with the compiler environment) -# MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 +# MSVCPATH="%ProgramFiles%\Microsoft Visual Studio .NET 2003\Vc7" ############################################################### @@ -15,7 +15,8 @@ FLEXTINC="%CommonProgramFiles%\Cycling '74\flext" FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +# (a good place is the MaxMSP program folder) +FLEXTSHLIB="%ProgramFiles%\MaxMSP 4.5" ############################################################### @@ -26,11 +27,19 @@ OUTPATH=max-msvc # where should the external be installed? INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" +# where should the initialization files be installed? +INITPATH="%CommonProgramFiles%\Cycling '74\init" + +# where should the help files be installed? +HELPPATH="%ProgramFiles%\MaxMSP 4.5\max-help\flext" + ############################################################### # some user-definable flags # (check if they match your system!) -OFLAGS=/G6 /Ox /arch:SSE +OFLAGS=/Ox +# optimizations for Pentium 4 +#OFLAGS=$(OFLAGS) /G6 /arch:SSE # uncomment to link against dynamic C runtime libraries # (don't use this if you want to distribute the built product) diff --git a/externals/grill/flext/buildsys/win/max/gnumake-mingw-ext.inc b/externals/grill/flext/buildsys/win/max/gnumake-mingw-ext.inc index 5df7e2f2..04e59462 100644 --- a/externals/grill/flext/buildsys/win/max/gnumake-mingw-ext.inc +++ b/externals/grill/flext/buildsys/win/max/gnumake-mingw-ext.inc @@ -1 +1 @@ -EXT=mxe
+EXT=mxe diff --git a/externals/grill/flext/buildsys/win/max/gnumake-mingw-flext.inc b/externals/grill/flext/buildsys/win/max/gnumake-mingw-flext.inc index da986e52..821d6fbc 100644 --- a/externals/grill/flext/buildsys/win/max/gnumake-mingw-flext.inc +++ b/externals/grill/flext/buildsys/win/max/gnumake-mingw-flext.inc @@ -1,6 +1,6 @@ -ifdef SHARED
-EXT=dll
-else
-EXT=LIB
-endif
-
+ifdef SHARED +EXT=dll +else +EXT=LIB +endif + diff --git a/externals/grill/flext/buildsys/win/max/nmake-msvc-ext.inc b/externals/grill/flext/buildsys/win/max/nmake-msvc-ext.inc index 5df7e2f2..04e59462 100644 --- a/externals/grill/flext/buildsys/win/max/nmake-msvc-ext.inc +++ b/externals/grill/flext/buildsys/win/max/nmake-msvc-ext.inc @@ -1 +1 @@ -EXT=mxe
+EXT=mxe diff --git a/externals/grill/flext/buildsys/win/max/nmake-msvc-flext.inc b/externals/grill/flext/buildsys/win/max/nmake-msvc-flext.inc index a080ae72..d30a7144 100644 --- a/externals/grill/flext/buildsys/win/max/nmake-msvc-flext.inc +++ b/externals/grill/flext/buildsys/win/max/nmake-msvc-flext.inc @@ -1,5 +1,5 @@ -!ifdef SHARED
-EXT=dll
-!else
-EXT=lib
-!endif
+!ifdef SHARED +EXT=dll +!else +EXT=lib +!endif diff --git a/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc b/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc index 252d5d2f..419c3276 100644 --- a/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc +++ b/externals/grill/flext/buildsys/win/nmake-msvc-ext.inc @@ -1,45 +1,44 @@ -# build class specific settings
-
-INCPATH=$(INCPATH) /I$(FLEXTINC)
-LIBPATH=$(LIBPATH) /LIBPATH:$(FLEXTLIB)
-LIBS=$(LIBS) $(FLEXTNAME).lib
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-$(OUTPATH):
- if not exist $@ mkdir $@ > nul
-
-$(TARGETPATH): $(OUTPATH)
- if not exist $@ mkdir $@ > nul
-
-{$(SRCDIR)}.cpp{}.obj:
- cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@
-
-{$(SRCDIR)}.c{}.obj:
- cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@
-
-$(TARGET):: $(TARGETPATH)
-
-$(TARGET):: $(OBJS)
- @cd $(TARGETPATH)
- link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /out:$(@F)
- @cd ..\..
-
-##############################################
-# remove build
-
-_clean_:
- -del /q $(TARGET) > nul
- -cd $(TARGETPATH)
- -del /q $(OBJS) > nul
-
-##############################################
-
-$(INSTPATH):
- if not exist $@ mkdir $@ > nul
-
-_install_: $(INSTPATH)
- copy $(TARGET) $(INSTPATH) > nul
+# build class specific settings + +INCPATH=$(INCPATH) /I$(FLEXTINC) +LIBPATH=$(LIBPATH) /LIBPATH:$(FLEXTLIB) +LIBS=$(LIBS) $(FLEXTNAME).lib + +############################################## + +# default target +_build_: $(TARGET) + +$(OUTPATH): + if not exist $@ mkdir $@ > nul + +$(TARGETPATH): $(OUTPATH) + if not exist $@ mkdir $@ > nul + +{$(SRCDIR)}.cpp{}.obj: + cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ + +{$(SRCDIR)}.c{}.obj: + cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ + +$(TARGET):: $(TARGETPATH) + +$(TARGET):: $(OBJS) + @cd $(TARGETPATH) + link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /out:$(@F) + @cd ..\.. + +############################################## +# remove build + +_clean_: + -del /q $(TARGETPATH)\*.* > nul + -rmdir /q $(TARGETPATH) > nul + +############################################## + +$(INSTPATH): + if not exist $@ mkdir $@ > nul + +_install_: $(INSTPATH) + copy $(TARGET) $(INSTPATH) > nul diff --git a/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc b/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc index 6c64d682..389533de 100644 --- a/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc +++ b/externals/grill/flext/buildsys/win/nmake-msvc-flext.inc @@ -1,66 +1,65 @@ -# build class specific settings
-
-##############################################
-
-# default target
-_build_: $(TARGET)
-
-$(OUTPATH):
- if not exist $@ mkdir $@ > nul
-
-$(TARGETPATH): $(OUTPATH)
- if not exist $@ mkdir $@ > nul
-
-{$(SRCDIR)}.cpp{}.obj:
- cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@
-
-{$(SRCDIR)}.c{}.obj:
- cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@
-
-
-$(TARGET):: $(TARGETPATH)
-
-$(TARGET):: $(OBJS)
- @cd $(TARGETPATH)
-!ifdef SHARED
- link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /out:$(@F)
-!else
- lib /OUT:$(@F) $(OBJS)
-!endif
- @cd ..\..
-
-##############################################
-
-# remove build
-_clean_:
- -del /q $(TARGET) > nul
- -cd $(TARGETPATH)
- -del /q $(OBJS) > nul
-
-##############################################
-
-!ifdef SHARED
-FLEXTLIBINST=$(FLEXTSHLIB)
-!else
-FLEXTLIBINST=$(FLEXTLIB)
-!endif
-
-$(FLEXTINC):
- if not exist $@ mkdir $@ > nul
-
-$(FLEXTLIB):
- if not exist $@ mkdir $@ > nul
-
-$(FLEXTLIBINST):
- if not exist $@ mkdir $@ > nul
-
-_install_:: $(FLEXTINC) $(FLEXTLIB) $(FLEXTLIBINST)
-
-_install_::
- copy $(TARGET) $(FLEXTLIBINST) > nul
-!ifdef SHARED
-# copy import library
- copy $(TARGET:.dll=.lib) $(FLEXTLIB) > nul
-!endif
-# copy headers
- for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(FLEXTINC) > nul
+# build class specific settings + +############################################## + +# default target +_build_: $(TARGET) + +$(OUTPATH): + if not exist $@ mkdir $@ > nul + +$(TARGETPATH): $(OUTPATH) + if not exist $@ mkdir $@ > nul + +{$(SRCDIR)}.cpp{}.obj: + cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ + +{$(SRCDIR)}.c{}.obj: + cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ + + +$(TARGET):: $(TARGETPATH) + +$(TARGET):: $(OBJS) + @cd $(TARGETPATH) +!ifdef SHARED + link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /out:$(@F) +!else + lib /OUT:$(@F) $(OBJS) +!endif + @cd ..\.. + +############################################## + +# remove build +_clean_: + -del /q $(TARGETPATH)\*.* > nul + -rmdir /q $(TARGETPATH) > nul + +############################################## + +!ifdef SHARED +FLEXTLIBINST=$(FLEXTSHLIB) +!else +FLEXTLIBINST=$(FLEXTLIB) +!endif + +$(FLEXTINC): + if not exist $@ mkdir $@ > nul + +$(FLEXTLIB): + if not exist $@ mkdir $@ > nul + +$(FLEXTLIBINST): + if not exist $@ mkdir $@ > nul + +_install_:: $(FLEXTINC) $(FLEXTLIB) $(FLEXTLIBINST) + +_install_:: + copy $(TARGET) $(FLEXTLIBINST) > nul +!ifdef SHARED +# copy import library + copy $(TARGET:.dll=.lib) $(FLEXTLIB) > nul +!endif +# copy headers + for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(FLEXTINC) > nul diff --git a/externals/grill/flext/buildsys/win/nmake-msvc.inc b/externals/grill/flext/buildsys/win/nmake-msvc.inc index fb74a7bf..b8a51425 100644 --- a/externals/grill/flext/buildsys/win/nmake-msvc.inc +++ b/externals/grill/flext/buildsys/win/nmake-msvc.inc @@ -5,24 +5,21 @@ LIBPATH=$(LIBPATH) /LIBPATH:$(MSVCPATH)\lib ############################################## -TARGETPATH=$(OUTPATH)\$(OUTSUB) +OBJPATH=$(OUTPATH)\$(OUTSUB) +TARGETPATH=$(OBJPATH) TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT) ############################################## # use precompiled headers (automatic mode) -!ifndef PRECOMPILE -CFLAGS=$(CFLAGS) /YXflext.h -!else -CFLAGS=$(CFLAGS) /YX$(PRECOMPILE) +!ifdef PRECOMPILE +CFLAGS=$(CFLAGS) /YX$(PRECOMPILE) /Fp$(OBJPATH)\precompiled.pch !endif -# location of precompiled file -CFLAGS=$(CFLAGS) /Fp$(TARGETPATH)\precompiled.pch ############################################## # create code for DLL -CFLAGS=$(CFLAGS) /LD /GD +CFLAGS=$(CFLAGS) /LD # enable exception handling CFLAGS=$(CFLAGS) /GX diff --git a/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc b/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc index b2234c5b..26bcf06e 100644 --- a/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc +++ b/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc @@ -1 +1 @@ -EXT=dll
+EXT=dll diff --git a/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc b/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc index a080ae72..d30a7144 100644 --- a/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc +++ b/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc @@ -1,5 +1,5 @@ -!ifdef SHARED
-EXT=dll
-!else
-EXT=lib
-!endif
+!ifdef SHARED +EXT=dll +!else +EXT=lib +!endif diff --git a/externals/grill/flext/buildsys/win/pd/config-bcc.def b/externals/grill/flext/buildsys/win/pd/config-bcc.def index 285e5b02..e473c6a7 100644 --- a/externals/grill/flext/buildsys/win/pd/config-bcc.def +++ b/externals/grill/flext/buildsys/win/pd/config-bcc.def @@ -1,8 +1,8 @@ # where is PD? -PDPATH=c:\programme\audio\pd +PDPATH="c:\program files\pd" # where is BorlandC++? -BCCPATH=C:\Programme\prog\bcc55 +BCCPATH="c:\program files\bcc55" ############################################################### @@ -13,7 +13,7 @@ FLEXTINC=$(PDPATH)\flext FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +FLEXTSHLIB=$(PDPATH)\bin ############################################################### @@ -28,4 +28,3 @@ INSTPATH=$(PDPATH)\extra # user defined compiler flags # (check if they match your system!) OFLAGS=-6 -O2 -OS -ff -d - diff --git a/externals/grill/flext/buildsys/win/pd/config-cygwin.def b/externals/grill/flext/buildsys/win/pd/config-cygwin.def index 11bca921..980ebc77 100644 --- a/externals/grill/flext/buildsys/win/pd/config-cygwin.def +++ b/externals/grill/flext/buildsys/win/pd/config-cygwin.def @@ -1,5 +1,5 @@ # where is PD? -PDPATH=/cygdrive/c/programme/audio/pd +PDPATH=/cygdrive/c/programme/pd ############################################################### @@ -10,7 +10,7 @@ FLEXTINC=$(PDPATH)/flext FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +FLEXTSHLIB=$(PDPATH)/bin ############################################################### @@ -24,4 +24,6 @@ INSTPATH=$(PDPATH)/extra # user defined compiler flags # (check if they match your system!) -OFLAGS=-O2 -march=pentium4 -msse +OFLAGS=-O2 +# optimizations for Pentium 4 +#OFLAGS += -march=pentium4 -msse diff --git a/externals/grill/flext/buildsys/win/pd/config-mingw.def b/externals/grill/flext/buildsys/win/pd/config-mingw.def index 7b720f58..9a65dfd9 100644 --- a/externals/grill/flext/buildsys/win/pd/config-mingw.def +++ b/externals/grill/flext/buildsys/win/pd/config-mingw.def @@ -1,16 +1,16 @@ # where is PD? -PDPATH=c:/programme/audio/pd +PDPATH="%ProgramFiles%\pd" ############################################################### # where do/should the flext headers reside/be built? -FLEXTINC=$(PDPATH)/flext +FLEXTINC=$(PDPATH)\flext # where do/should the flext static libraries reside/be built? FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +FLEXTSHLIB=$(PDPATH)\bin ############################################################### @@ -18,10 +18,12 @@ FLEXTSHLIB=$(FLEXTINC) OUTPATH=pd-mingw # where should the external be installed? -INSTPATH=$(PDPATH)/extra +INSTPATH=$(PDPATH)\extra ############################################################### # user defined compiler flags # (check if they match your system!) -OFLAGS=-O2 -march=pentium4 -msse +OFLAGS=-O2 +# optimizations for Pentium 4 +#OFLAGS += -march=pentium4 -msse diff --git a/externals/grill/flext/buildsys/win/pd/config-msvc.def b/externals/grill/flext/buildsys/win/pd/config-msvc.def index a7171ff2..7d808765 100644 --- a/externals/grill/flext/buildsys/win/pd/config-msvc.def +++ b/externals/grill/flext/buildsys/win/pd/config-msvc.def @@ -1,9 +1,9 @@ # where is PD? -PDPATH=c:\programme\audio\pd +PDPATH="%ProgramFiles%\pd" # where is MS VC++? # (not necessary if the build is run with the compiler environment) -# MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 +# MSVCPATH="%ProgramFiles%\Microsoft Visual Studio .NET 2003\Vc7" ############################################################### @@ -14,7 +14,7 @@ FLEXTINC=$(PDPATH)\flext FLEXTLIB=$(FLEXTINC) # where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTINC) +FLEXTSHLIB=$(PDPATH)\bin ############################################################### @@ -29,7 +29,9 @@ INSTPATH=$(PDPATH)\extra # user defined compiler flags # (check if they match your system!) -OFLAGS=/G6 /Ox /arch:SSE +OFLAGS=/Ox +# optimizations for Pentium 4 +#OFLAGS=$(OFLAGS) /G6 /arch:SSE # uncomment to link against dynamic C runtime libraries # (don't use this if you want to distribute the built product) diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc index b2234c5b..26bcf06e 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc @@ -1 +1 @@ -EXT=dll
+EXT=dll diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc index 5c8a7a83..e64eb6c5 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc @@ -1,5 +1,5 @@ -ifdef SHARED
-EXT=dll
-else
-EXT=a
-endif
+ifdef SHARED +EXT=dll +else +EXT=a +endif diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc index 054526c0..017635ae 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc @@ -3,7 +3,7 @@ DEFS += -DFLEXT_SYS=2 INCPATH += -I$(PDPATH)/src # trick PD in a way that only the cygwin pthread headers are used -CFLAGS += -include /usr/include/pthread.h -DPTHREAD_H +CFLAGS += -include /usr/include/sched.h -include /usr/include/pthread.h -DPTHREAD_H LIBS += $(PDPATH)/bin/pd.dll #LIBS += $(PDPATH)/bin/pthreadVC.dll diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc index b2234c5b..26bcf06e 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc @@ -1 +1 @@ -EXT=dll
+EXT=dll diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc index 5c8a7a83..e64eb6c5 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc @@ -1,5 +1,5 @@ -ifdef SHARED
-EXT=dll
-else
-EXT=a
-endif
+ifdef SHARED +EXT=dll +else +EXT=a +endif diff --git a/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc b/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc index b2234c5b..26bcf06e 100644 --- a/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc +++ b/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc @@ -1 +1 @@ -EXT=dll
+EXT=dll diff --git a/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc b/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc index a080ae72..d30a7144 100644 --- a/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc +++ b/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc @@ -1,5 +1,5 @@ -!ifdef SHARED
-EXT=dll
-!else
-EXT=lib
-!endif
+!ifdef SHARED +EXT=dll +!else +EXT=lib +!endif |