From e741586389de21efe0dd7fa1b0057c970e4c1a17 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 18 Dec 2004 05:01:11 +0000 Subject: updated build system for linux updated make system for BCC build system for flext-based externals updated build system add xcode project comply to build system svn path=/trunk/; revision=2405 --- externals/grill/flext/build-pd-bcc.bat | 2 +- externals/grill/flext/build/bmake.mak | 29 +++++++ externals/grill/flext/build/config-lnx-pd-gcc.def | 15 ++++ externals/grill/flext/build/config-mac-pd-gcc.def | 18 +++++ .../grill/flext/build/config-win-max-mingw.def | 17 ++++ .../grill/flext/build/config-win-max-msvc.def | 15 ++-- .../grill/flext/build/config-win-max-msvc.txt | 22 ------ externals/grill/flext/build/config-win-pd-bcc.def | 19 +++++ .../grill/flext/build/config-win-pd-cygwin.def | 18 +++++ .../grill/flext/build/config-win-pd-mingw.def | 15 ++++ externals/grill/flext/build/config-win-pd-msvc.def | 11 ++- externals/grill/flext/build/config-win-pd-msvc.txt | 20 ----- externals/grill/flext/build/gnumake.mak | 28 +++++++ externals/grill/flext/build/make-lnx-gen-gcc.inc | 68 ++++++++++++++++ externals/grill/flext/build/make-lnx-pd-gcc.inc | 43 ++++++++++ externals/grill/flext/build/make-mac-gen-gcc.inc | 68 ++++++++++++++++ externals/grill/flext/build/make-mac-pd-gcc.inc | 43 ++++++++++ externals/grill/flext/build/make-win-gen-bcc.inc | 83 +++++++++++++++++++ .../grill/flext/build/make-win-gen-cygwin.inc | 68 ++++++++++++++++ externals/grill/flext/build/make-win-gen-mingw.inc | 69 ++++++++++++++++ externals/grill/flext/build/make-win-gen-msvc.inc | 37 ++++----- externals/grill/flext/build/make-win-max-mingw.inc | 35 ++++++++ externals/grill/flext/build/make-win-max-msvc.inc | 8 +- externals/grill/flext/build/make-win-pd-bcc.inc | 35 ++++++++ externals/grill/flext/build/make-win-pd-cygwin.inc | 43 ++++++++++ externals/grill/flext/build/make-win-pd-mingw.inc | 34 ++++++++ externals/grill/flext/build/make-win-pd-msvc.inc | 8 +- externals/grill/flext/build/nmake.mak | 30 +++++++ externals/grill/flext/config-pd-bcc.txt | 7 +- externals/grill/flext/config-pd-darwin.txt | 4 +- externals/grill/flext/flext.vcproj | 4 +- externals/grill/flext/flext.xcode/project.pbxproj | 2 - externals/grill/flext/make-files.txt | 2 + externals/grill/flext/make-inc.pd-bcc | 92 ++++++++++++++++++++++ externals/grill/flext/makefile.pd-bcc | 89 ++++----------------- externals/grill/flext/source/flthr.cpp | 11 ++- 36 files changed, 939 insertions(+), 173 deletions(-) create mode 100644 externals/grill/flext/build/bmake.mak create mode 100644 externals/grill/flext/build/config-lnx-pd-gcc.def create mode 100644 externals/grill/flext/build/config-mac-pd-gcc.def create mode 100644 externals/grill/flext/build/config-win-max-mingw.def delete mode 100644 externals/grill/flext/build/config-win-max-msvc.txt create mode 100644 externals/grill/flext/build/config-win-pd-bcc.def create mode 100644 externals/grill/flext/build/config-win-pd-cygwin.def create mode 100644 externals/grill/flext/build/config-win-pd-mingw.def delete mode 100644 externals/grill/flext/build/config-win-pd-msvc.txt create mode 100644 externals/grill/flext/build/gnumake.mak create mode 100644 externals/grill/flext/build/make-lnx-gen-gcc.inc create mode 100644 externals/grill/flext/build/make-lnx-pd-gcc.inc create mode 100644 externals/grill/flext/build/make-mac-gen-gcc.inc create mode 100644 externals/grill/flext/build/make-mac-pd-gcc.inc create mode 100644 externals/grill/flext/build/make-win-gen-bcc.inc create mode 100644 externals/grill/flext/build/make-win-gen-cygwin.inc create mode 100644 externals/grill/flext/build/make-win-gen-mingw.inc create mode 100644 externals/grill/flext/build/make-win-max-mingw.inc create mode 100644 externals/grill/flext/build/make-win-pd-bcc.inc create mode 100644 externals/grill/flext/build/make-win-pd-cygwin.inc create mode 100644 externals/grill/flext/build/make-win-pd-mingw.inc create mode 100644 externals/grill/flext/build/nmake.mak create mode 100644 externals/grill/flext/make-inc.pd-bcc (limited to 'externals/grill/flext') diff --git a/externals/grill/flext/build-pd-bcc.bat b/externals/grill/flext/build-pd-bcc.bat index b1e6eaf4..08f706c5 100644 --- a/externals/grill/flext/build-pd-bcc.bat +++ b/externals/grill/flext/build-pd-bcc.bat @@ -1,3 +1,3 @@ @echo --- Building flext with BorlandC++ --- -make -f makefile.pd-bcc +make -f makefile.pd-bcc %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/externals/grill/flext/build/bmake.mak b/externals/grill/flext/build/bmake.mak new file mode 100644 index 00000000..5ee54fbb --- /dev/null +++ b/externals/grill/flext/build/bmake.mak @@ -0,0 +1,29 @@ +# PLATFORM - win +# RTSYS - pd/max +# COMPILER - bcc + +# this should be improved +BUILDPATH=..\flext\build + +# general settings +!include $(BUILDPATH)\config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt + +############################### + +# these are project specific + +# special package settings +!include config-$(PLATFORM)-$(COMPILER).txt + +# package specific make stuff +!include makefile-$(PLATFORM)-$(COMPILER).txt + +# package info +!include make-files.txt + +############################## + +# platform-specific make stuff +!include $(BUILDPATH)\make-$(PLATFORM)-$(RTSYS)-$(COMPILER).inc +# general make stuff +!include $(BUILDPATH)\make-$(PLATFORM)-gen-$(COMPILER).inc diff --git a/externals/grill/flext/build/config-lnx-pd-gcc.def b/externals/grill/flext/build/config-lnx-pd-gcc.def new file mode 100644 index 00000000..56ddc5d8 --- /dev/null +++ b/externals/grill/flext/build/config-lnx-pd-gcc.def @@ -0,0 +1,15 @@ +# where is the PD source package? +PDPATH=/usr/local/src/pd-0.38-0test10 + +# where should the external be installed? +INSTPATH=/usr/local/lib/pd/extra + +# where do the flext headers and libraries reside? +FLEXTPATH=/usr/local/lib/pd/flext + +# where should the external be built? +OUTPATH=pd-linux + +# user defined compiler flags +# (check if they match your system!) +OFLAGS=-O2 -march=pentium4 -msse diff --git a/externals/grill/flext/build/config-mac-pd-gcc.def b/externals/grill/flext/build/config-mac-pd-gcc.def new file mode 100644 index 00000000..6409e901 --- /dev/null +++ b/externals/grill/flext/build/config-mac-pd-gcc.def @@ -0,0 +1,18 @@ +# where is the PD installation? +PDPATH=/usr/local/lib/pd + +# where is the PD executable? +PDBIN=/usr/local/bin/pd + +# where should the external be installed? +INSTPATH=$(PDPATH)/extra + +# where do the flext headers and libraries reside? +FLEXTPATH=$(PDPATH)/flext + +# where should the external be built? +OUTPATH=pd-darwin + +# user defined compiler flags +# (check if they match your system!) +OFLAGS=-O2 -mcpu=G4 -malign-natural -maltivec -faltivec diff --git a/externals/grill/flext/build/config-win-max-mingw.def b/externals/grill/flext/build/config-win-max-mingw.def new file mode 100644 index 00000000..d6bbd4dc --- /dev/null +++ b/externals/grill/flext/build/config-win-max-mingw.def @@ -0,0 +1,17 @@ +# 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 should the external be installed? +INSTPATH="%CommonProgramFiles%/Cycling '74/externals/flext" + +# where do the flext headers and libraries reside? +FLEXTPATH="%CommonProgramFiles%/Cycling '74/flext" + +# where should the external be built? +# (path for temporary files) +OUTPATH=max-mingw + +# some user-definable flags +# (check if they match your system!) +OFLAGS=-O2 -march=pentium4 -msse diff --git a/externals/grill/flext/build/config-win-max-msvc.def b/externals/grill/flext/build/config-win-max-msvc.def index c1192ad4..a7db2d2c 100644 --- a/externals/grill/flext/build/config-win-max-msvc.def +++ b/externals/grill/flext/build/config-win-max-msvc.def @@ -2,21 +2,16 @@ # you should have the latest version! MAXSDKPATH="c:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support" -# where do the flext libraries reside? -FLEXTPATH="%CommonProgramFiles%\Cycling '74\flext" +# where should the external be installed? +INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" -# where is MS VC++? -# (need not be defined if the build is started with the compiler environment set) -# MSVCPATH="c:\programme\prog\microsoft visual studio\VC98" +# where do the flext headers and libraries reside? +FLEXTPATH="%CommonProgramFiles%\Cycling '74\flext" # where should the external be built? # (path for temporary files) OUTPATH=max-msvc -# where should the external be installed? -# (leave blank to omit installation) -INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" - # some user-definable flags # (check if they match your system!) -UFLAGS=/G6 /Ox /arch:SSE +OFLAGS=/G6 /Ox /arch:SSE diff --git a/externals/grill/flext/build/config-win-max-msvc.txt b/externals/grill/flext/build/config-win-max-msvc.txt deleted file mode 100644 index c1192ad4..00000000 --- a/externals/grill/flext/build/config-win-max-msvc.txt +++ /dev/null @@ -1,22 +0,0 @@ -# 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 do the flext libraries reside? -FLEXTPATH="%CommonProgramFiles%\Cycling '74\flext" - -# where is MS VC++? -# (need not be defined if the build is started with the compiler environment set) -# MSVCPATH="c:\programme\prog\microsoft visual studio\VC98" - -# where should the external be built? -# (path for temporary files) -OUTPATH=max-msvc - -# where should the external be installed? -# (leave blank to omit installation) -INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" - -# some user-definable flags -# (check if they match your system!) -UFLAGS=/G6 /Ox /arch:SSE diff --git a/externals/grill/flext/build/config-win-pd-bcc.def b/externals/grill/flext/build/config-win-pd-bcc.def new file mode 100644 index 00000000..b93cece3 --- /dev/null +++ b/externals/grill/flext/build/config-win-pd-bcc.def @@ -0,0 +1,19 @@ +# where is PD? +PDPATH=c:\programme\audio\pd + +# where should the external be installed? +INSTPATH=$(PDPATH)\extra + +# where do the flext headers and libraries reside? +FLEXTPATH=$(PDPATH)\flext + +# where is BorlandC++? +BCCPATH=C:\Programme\prog\bcc55 + +# where should the external be built? +OUTPATH=pd-bcc + +# user defined compiler flags +# (check if they match your system!) +OFLAGS=-6 -O2 -OS -ff -d + diff --git a/externals/grill/flext/build/config-win-pd-cygwin.def b/externals/grill/flext/build/config-win-pd-cygwin.def new file mode 100644 index 00000000..1c92fe66 --- /dev/null +++ b/externals/grill/flext/build/config-win-pd-cygwin.def @@ -0,0 +1,18 @@ +# where is PD? +# (it seems like cygwin compilation is only working if +# there are no pthread.h and sched.h in the PD src subfolder +# - these are provided by cygwin ) +PDPATH=/cygdrive/c/programme/audio/pd + +# where should the external be installed? +INSTPATH=$(PDPATH)/extra + +# where do the flext headers and libraries reside? +FLEXTPATH=$(PDPATH)/flext + +# where should the external be built? +OUTPATH=pd-cygwin + +# user defined compiler flags +# (check if they match your system!) +OFLAGS=-O2 -march=pentium4 -msse diff --git a/externals/grill/flext/build/config-win-pd-mingw.def b/externals/grill/flext/build/config-win-pd-mingw.def new file mode 100644 index 00000000..a721d45d --- /dev/null +++ b/externals/grill/flext/build/config-win-pd-mingw.def @@ -0,0 +1,15 @@ +# where is PD? +PDPATH=c:/programme/audio/pd + +# where should the external be installed? +INSTPATH=$(PDPATH)/extra + +# where do the flext headers and libraries reside? +FLEXTPATH=$(PDPATH)/flext + +# where should the external be built? +OUTPATH=pd-mingw + +# user defined compiler flags +# (check if they match your system!) +OFLAGS=-O2 -march=pentium4 -msse diff --git a/externals/grill/flext/build/config-win-pd-msvc.def b/externals/grill/flext/build/config-win-pd-msvc.def index bdce5879..aa4c5feb 100644 --- a/externals/grill/flext/build/config-win-pd-msvc.def +++ b/externals/grill/flext/build/config-win-pd-msvc.def @@ -1,7 +1,10 @@ # where is PD? PDPATH=c:\programme\audio\pd -# where do the flext libraries reside? +# where should the external be installed? +INSTPATH=$(PDPATH)\extra + +# where do the flext headers and libraries reside? FLEXTPATH=$(PDPATH)\flext # where is MS VC++? @@ -11,10 +14,6 @@ FLEXTPATH=$(PDPATH)\flext # where should the external be built? OUTPATH=pd-msvc -# where should the external be installed? -# (leave blank to omit installation) -INSTPATH=$(PDPATH)\extra - # user defined compiler flags # (check if they match your system!) -UFLAGS=/G6 /Ox /arch:SSE +OFLAGS=/G6 /Ox /arch:SSE diff --git a/externals/grill/flext/build/config-win-pd-msvc.txt b/externals/grill/flext/build/config-win-pd-msvc.txt deleted file mode 100644 index bdce5879..00000000 --- a/externals/grill/flext/build/config-win-pd-msvc.txt +++ /dev/null @@ -1,20 +0,0 @@ -# where is PD? -PDPATH=c:\programme\audio\pd - -# where do the flext libraries reside? -FLEXTPATH=$(PDPATH)\flext - -# where is MS VC++? -# (not necessary if the build is run with the compiler environment) -# MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 - -# where should the external be built? -OUTPATH=pd-msvc - -# where should the external be installed? -# (leave blank to omit installation) -INSTPATH=$(PDPATH)\extra - -# user defined compiler flags -# (check if they match your system!) -UFLAGS=/G6 /Ox /arch:SSE diff --git a/externals/grill/flext/build/gnumake.mak b/externals/grill/flext/build/gnumake.mak new file mode 100644 index 00000000..9754633d --- /dev/null +++ b/externals/grill/flext/build/gnumake.mak @@ -0,0 +1,28 @@ +# PLATFORM - win/mac/lnx +# RTSYS - pd/max +# COMPILER - msvc/gcc/mingw/cygwin + +# this should be improved +BUILDPATH=../flext/build + +include $(BUILDPATH)/config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt + +############################### + +# these are project specific + +# special settings +include config-$(PLATFORM)-$(COMPILER).txt + +# package specific make stuff +include makefile-$(PLATFORM)-$(COMPILER).txt + +# package info +include make-files.txt + +############################## + +# platform-specific make stuff +include $(BUILDPATH)/make-$(PLATFORM)-$(RTSYS)-$(COMPILER).inc +# general make stuff +include $(BUILDPATH)/make-$(PLATFORM)-gen-$(COMPILER).inc diff --git a/externals/grill/flext/build/make-lnx-gen-gcc.inc b/externals/grill/flext/build/make-lnx-gen-gcc.inc new file mode 100644 index 00000000..3c474864 --- /dev/null +++ b/externals/grill/flext/build/make-lnx-gen-gcc.inc @@ -0,0 +1,68 @@ +LDFLAGS += -shared -Wl,-x + +ifdef DEBUG +CFLAGS += -g -D_DEBUG +else +CFLAGS += $(OFLAGS) -DNDEBUG +LDFLAGS += -Wl,-S +endif + +############################################## + +INCPATH += -I$(FLEXTPATH) +LIBPATH += -L$(FLEXTPATH) + +ifdef SHARED +# --- shared --- +DEFS += -DFLEXT_SHARED + +else +ifdef THREADED +# --- static multi-threaded --- +DEFS += -DFLEXT_THREADS + +else +# --- static single-threaded --- + +endif +endif + +############################################## + +TARGET=$(OUTPATH)/$(NAME).$(EXT) + +CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) +CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) +COBJS=$(patsubst %.c,$(OUTPATH)/%.o,$(filter %.c,$(SRCS))) +CPPOBJS=$(patsubst %.cpp,$(OUTPATH)/%.opp,$(filter %.cpp,$(SRCS))) + +# default target +all: $(OUTPATH) $(TARGET) + +$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) + touch $@ + +$(OUTPATH): + mkdir $(OUTPATH) + +$(OUTPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(OUTPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) : $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $^ $(LIBS) + chmod 755 $@ + +$(INSTPATH): + mkdir $(INSTPATH) + +install:: $(INSTPATH) + +install:: $(TARGET) + install $^ $(INSTPATH) + +.PHONY: clean +clean: + $(RM) $(COBJS) $(CPPOBJS) $(TARGET) diff --git a/externals/grill/flext/build/make-lnx-pd-gcc.inc b/externals/grill/flext/build/make-lnx-pd-gcc.inc new file mode 100644 index 00000000..2db3fe3d --- /dev/null +++ b/externals/grill/flext/build/make-lnx-pd-gcc.inc @@ -0,0 +1,43 @@ +DEFS += -DFLEXT_SYS=2 + +INCPATH += -I$(PDPATH)/src +LIBPATH += -L$(PDPATH)/bin + +LDFLAGS += + +LIBS += + +EXT=pd_linux + +######################################### + +ifdef SHARED +# --- shared --- + +ifdef DEBUG +LIBS += -lflext_d +else +LIBS += -lflext +endif + +else +ifdef THREADED +# --- static multi-threaded --- + +ifdef DEBUG +LIBS += $(FLEXTPATH)/libflext_td.a +else +LIBS += $(FLEXTPATH)/libflext_t.a +endif + +else +# --- static single-threaded --- + +ifdef DEBUG +LIBS += $(FLEXTPATH)/libflext_d.a +else +LIBS += $(FLEXTPATH)/libflext.a +endif + +endif +endif diff --git a/externals/grill/flext/build/make-mac-gen-gcc.inc b/externals/grill/flext/build/make-mac-gen-gcc.inc new file mode 100644 index 00000000..ffb49720 --- /dev/null +++ b/externals/grill/flext/build/make-mac-gen-gcc.inc @@ -0,0 +1,68 @@ +LDFLAGS += -Wl,-x -framework ApplicationServices -framework vecLib + +ifdef DEBUG +CFLAGS += -g -D_DEBUG +else +CFLAGS += $(OFLAGS) -DNDEBUG +LDFLAGS += -Wl,-S +endif + +############################################## + +INCPATH += -I$(FLEXTPATH) +LIBPATH += -L$(FLEXTPATH) + +ifdef SHARED +# --- shared --- +DEFS += -DFLEXT_SHARED + +else +ifdef THREADED +# --- static multi-threaded --- +DEFS += -DFLEXT_THREADS + +else +# --- static single-threaded --- + +endif +endif + +############################################## + +TARGET=$(OUTPATH)/$(NAME).$(EXT) + +CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) +CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) +COBJS=$(patsubst %.c,$(OUTPATH)/%.o,$(filter %.c,$(SRCS))) +CPPOBJS=$(patsubst %.cpp,$(OUTPATH)/%.opp,$(filter %.cpp,$(SRCS))) + +# default target +all: $(OUTPATH) $(TARGET) + +$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) + touch $@ + +$(OUTPATH): + mkdir $(OUTPATH) + +$(OUTPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(OUTPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) : $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $^ $(LIBS) + chmod 755 $@ + +$(INSTPATH): + mkdir $(INSTPATH) + +install:: $(INSTPATH) + +install:: $(TARGET) + install $^ $(INSTPATH) + +.PHONY: clean +clean: + $(RM) $(COBJS) $(CPPOBJS) $(TARGET) diff --git a/externals/grill/flext/build/make-mac-pd-gcc.inc b/externals/grill/flext/build/make-mac-pd-gcc.inc new file mode 100644 index 00000000..560c6ebb --- /dev/null +++ b/externals/grill/flext/build/make-mac-pd-gcc.inc @@ -0,0 +1,43 @@ +DEFS += -DFLEXT_SYS=2 + +INCPATH += -I$(PDPATH)/src +LIBPATH += -L$(PDPATH)/bin + +LDFLAGS += -bundle -bundle_loader $(PDBIN) + +LIBS += + +EXT=pd_darwin + +######################################### + +ifdef SHARED +# --- shared --- + +ifdef DEBUG +LIBS += -lflext_d +else +LIBS += -lflext +endif + +else +ifdef THREADED +# --- static multi-threaded --- + +ifdef DEBUG +LIBS += $(FLEXTPATH)/libflext_td.a +else +LIBS += $(FLEXTPATH)/libflext_t.a +endif + +else +# --- static single-threaded --- + +ifdef DEBUG +LIBS += $(FLEXTPATH)/libflext_d.a +else +LIBS += $(FLEXTPATH)/libflext.a +endif + +endif +endif diff --git a/externals/grill/flext/build/make-win-gen-bcc.inc b/externals/grill/flext/build/make-win-gen-bcc.inc new file mode 100644 index 00000000..b9fcabec --- /dev/null +++ b/externals/grill/flext/build/make-win-gen-bcc.inc @@ -0,0 +1,83 @@ +INCPATH=$(INCPATH) -I$(FLEXTPATH) +LIBPATH=$(LIBPATH) -L$(FLEXTPATH) + +!ifdef BCCPATH +INCPATH=$(INCPATH) -I$(BCCPATH)\include +LIBPATH=$(LIBPATH) -L$(BCCPATH)\lib +!endif + +LIBS=$(LIBS) cw32.lib import32.lib C0D32.OBJ +CFLAGS=$(CFLAGS) -tWD -tWM -w-8004 -w-8027 -w-8057 +LDFLAGS=$(LDFLAGS) /C /Tpd + +############################################## + +# use multithreaded static libraries +!ifdef DEBUG +CFLAGS=$(CFLAGS) -v -D_DEBUG +LDFLAGS=$(LDFLAGS) /v +!else +CFLAGS=$(CFLAGS) $(OFLAGS) -DNDEBUG +!endif + +!ifdef SHARED +# --- shared --- +DEFS=$(DEFS) -DFLEXT_SHARED + +!else +!ifdef THREADED +# --- static multi-threaded --- +DEFS=$(DEFS) -DFLEXT_THREADS + +!else +# --- static single-threaded --- + +!endif +!endif + +############################################## + +TARGET=$(OUTPATH)\$(NAME).$(EXT) + +# default target +all: $(OUTPATH) print $(TARGET) + +# convert both *.c and *.cpp +OBJSTMP= $(SRCS:.c=.obj) +OBJS= $(OBJSTMP:.objpp=.obj) + +print: + echo $(OBJS) + +$(OUTPATH): + @-if not exist $< mkdir $< + +SETUPFUNCTION=$(NAME)_setup + +$(OUTPATH)\$(NAME).def: + @echo EXPORTS $(SETUPFUNCTION) = _$(SETUPFUNCTION) > $< +# this next line fixes a strange problem with implib - lacking underscore?! + @echo IMPORTS _rtext_retext=PD.rtext_retext >> $< + +{$(SRCDIR)}.cpp{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(OUTPATH) $< + +{$(SRCDIR)}.c{}.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(OUTPATH) $< + +$(TARGET) :: $(OUTPATH) $(OUTPATH)\$(NAME).def + +$(TARGET) :: $(OBJS) + cd $(OUTPATH) + ilink32 $(LDFLAGS) $(LIBPATH) $** ,..\$<,,$(LIBS),$(NAME).def + cd .. + +# remove build +clean: + -del /q $(OUTPATH) > nul + -rmdir $(OUTPATH) > nul + +# install build +install: + @-if not exist $(INSTPATH) mkdir $(INSTPATH) + copy $(TARGET) $(INSTPATH) > nul diff --git a/externals/grill/flext/build/make-win-gen-cygwin.inc b/externals/grill/flext/build/make-win-gen-cygwin.inc new file mode 100644 index 00000000..3c474864 --- /dev/null +++ b/externals/grill/flext/build/make-win-gen-cygwin.inc @@ -0,0 +1,68 @@ +LDFLAGS += -shared -Wl,-x + +ifdef DEBUG +CFLAGS += -g -D_DEBUG +else +CFLAGS += $(OFLAGS) -DNDEBUG +LDFLAGS += -Wl,-S +endif + +############################################## + +INCPATH += -I$(FLEXTPATH) +LIBPATH += -L$(FLEXTPATH) + +ifdef SHARED +# --- shared --- +DEFS += -DFLEXT_SHARED + +else +ifdef THREADED +# --- static multi-threaded --- +DEFS += -DFLEXT_THREADS + +else +# --- static single-threaded --- + +endif +endif + +############################################## + +TARGET=$(OUTPATH)/$(NAME).$(EXT) + +CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) +CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) +COBJS=$(patsubst %.c,$(OUTPATH)/%.o,$(filter %.c,$(SRCS))) +CPPOBJS=$(patsubst %.cpp,$(OUTPATH)/%.opp,$(filter %.cpp,$(SRCS))) + +# default target +all: $(OUTPATH) $(TARGET) + +$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) + touch $@ + +$(OUTPATH): + mkdir $(OUTPATH) + +$(OUTPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(OUTPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) : $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $^ $(LIBS) + chmod 755 $@ + +$(INSTPATH): + mkdir $(INSTPATH) + +install:: $(INSTPATH) + +install:: $(TARGET) + install $^ $(INSTPATH) + +.PHONY: clean +clean: + $(RM) $(COBJS) $(CPPOBJS) $(TARGET) diff --git a/externals/grill/flext/build/make-win-gen-mingw.inc b/externals/grill/flext/build/make-win-gen-mingw.inc new file mode 100644 index 00000000..50d3c25c --- /dev/null +++ b/externals/grill/flext/build/make-win-gen-mingw.inc @@ -0,0 +1,69 @@ +LDFLAGS += -shared -Wl,-x + +ifdef DEBUG +CFLAGS += -g -D_DEBUG +else +CFLAGS += $(OFLAGS) -DNDEBUG +LDFLAGS += -Wl,-S +endif + +############################################## + +INCPATH += -I$(FLEXTPATH) +LIBPATH += -L$(FLEXTPATH) + +ifdef SHARED +# --- shared --- +DEFS += -DFLEXT_SHARED + +else +ifdef THREADED +# --- static multi-threaded --- +DEFS += -DFLEXT_THREADS + +else +# --- static single-threaded --- + +endif +endif + +############################################## + +TARGET=$(OUTPATH)/$(NAME).$(EXT) + +CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) +CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) +COBJS=$(patsubst %.c,$(OUTPATH)/%.o,$(filter %.c,$(SRCS))) +CPPOBJS=$(patsubst %.cpp,$(OUTPATH)/%.opp,$(filter %.cpp,$(SRCS))) + + +# default target +all: $(OUTPATH) $(TARGET) + +#$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS)) +# touch $@ + +$(OUTPATH): + mkdir $(OUTPATH) + +$(OUTPATH)/%.opp : $(SRCDIR)/%.cpp + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(OUTPATH)/%.o : $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ + +$(TARGET) : $(COBJS) $(CPPOBJS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $^ $(LIBS) + chmod 755 $@ + +$(INSTPATH): + mkdir $(INSTPATH) + +install:: $(INSTPATH) + +install:: $(TARGET) + $(CP) $^ $(INSTPATH) + +.PHONY: clean +clean: + $(RM) $(COBJS) $(CPPOBJS) $(TARGET) diff --git a/externals/grill/flext/build/make-win-gen-msvc.inc b/externals/grill/flext/build/make-win-gen-msvc.inc index 0538f63e..1fc06c8f 100644 --- a/externals/grill/flext/build/make-win-gen-msvc.inc +++ b/externals/grill/flext/build/make-win-gen-msvc.inc @@ -6,26 +6,25 @@ INCPATH=$(INCPATH) /I$(MSVCPATH)\include LIBPATH=$(LIBPATH) /LIBPATH:$(MSVCPATH)\lib !endif -# add user flags -CFLAGS=$(UFLAGS) - -# for VC7 - exception handling +# for VC7 - enable exception handling CFLAGS=$(CFLAGS) /EHsc ############################################## # use multithreaded static libraries -!ifdef _DEBUG -CFLAGS=$(CFLAGS) /DMTd +!ifdef DEBUG +CFLAGS=$(CFLAGS) /D_DEBUG /DMTd +LDFLAGS=$(LDFLAGS) /DEBUG !else -CFLAGS=$(CFLAGS) /DMT +CFLAGS=$(CFLAGS) $(OFLAGS) /DNDEBUG /DMT +LDFLAGS=$(LDFLAGS) /INCREMENTAL:NO !endif -!ifdef FLEXT_SHARED +!ifdef SHARED # --- shared --- DEFS=$(DEFS) /DFLEXT_SHARED -!elseifdef FLEXT_THREADED +!elseifdef THREADED # --- static multi-threaded --- DEFS=$(DEFS) /DFLEXT_THREADS @@ -36,13 +35,9 @@ DEFS=$(DEFS) /DFLEXT_THREADS ############################################## +# default target all: $(OUTPATH) $(OUTPATH)\$(NAME).$(EXT) -# remove build -clean: - -del /q $(OUTPATH) > nul - -rmdir $(OUTPATH) > nul - OBJS= $(SRCS:.c=.obj) OBJS= $(OBJS:.objpp=.obj) @@ -57,11 +52,17 @@ $(OUTPATH): $(OUTPATH)\$(NAME).$(EXT): $(OBJS) cd $(OUTPATH) - link /DLL $(LDFLAGS) /out:$(NAME).$(EXT) /INCREMENTAL:NO $** $(LIBS) $(LIBPATH) + link /DLL $(LDFLAGS) /out:$(NAME).$(EXT) $** $(LIBS) $(LIBPATH) @-del *.exp @-del *.lib cd .. -!ifdef INSTPATH + +# remove build +clean: + -del /q $(OUTPATH) > nul + -rmdir $(OUTPATH) > nul + +# install build +install: @-if not exist $(INSTPATH) mkdir $(INSTPATH) - copy $@ $(INSTPATH) > nul -!endif + copy $(OUTPATH)\$(NAME).$(EXT) $(INSTPATH) > nul diff --git a/externals/grill/flext/build/make-win-max-mingw.inc b/externals/grill/flext/build/make-win-max-mingw.inc new file mode 100644 index 00000000..c34825f8 --- /dev/null +++ b/externals/grill/flext/build/make-win-max-mingw.inc @@ -0,0 +1,35 @@ +DEFS += -DFLEXT_SYS=1 +CFLAGS += -fpack-struct=2 + +INCPATH += -I$(MAXSDKPATH)/max-includes -I$(MAXSDKPATH)/msp-includes +LIBPATH += -L$(MAXSDKPATH)/max-includes -L$(MAXSDKPATH)/msp-includes + +# these are both in PDPATH +LIBS += -lmaxapi -lmaxaudio + +EXT=mxe + +######################################### + +ifdef SHARED +# --- shared --- + +elseifdef THREADED +# --- static multi-threaded --- + +ifdef DEBUG +LIBS += -lflext_td-maxwin +else +LIBS += -lflext_t-maxwin +endif + +else +# --- static single-threaded --- + +ifdef DEBUG +LIBS += -lflext_d-maxwin +else +LIBS += -lflext-maxwin +endif + +endif diff --git a/externals/grill/flext/build/make-win-max-msvc.inc b/externals/grill/flext/build/make-win-max-msvc.inc index eb03a828..636029fa 100644 --- a/externals/grill/flext/build/make-win-max-msvc.inc +++ b/externals/grill/flext/build/make-win-max-msvc.inc @@ -11,13 +11,13 @@ EXT=mxe ######################################### -!ifdef FLEXT_SHARED +!ifdef SHARED # --- shared --- -!elseifdef FLEXT_THREADED +!elseifdef THREADED # --- static multi-threaded --- -!ifdef _DEBUG +!ifdef DEBUG LIBS=$(LIBS) flext_td-maxwin.lib !else LIBS=$(LIBS) flext_t-maxwin.lib @@ -26,7 +26,7 @@ LIBS=$(LIBS) flext_t-maxwin.lib !else # --- static single-threaded --- -!ifdef _DEBUG +!ifdef DEBUG LIBS=$(LIBS) flext_d-maxwin.lib !else LIBS=$(LIBS) flext-maxwin.lib diff --git a/externals/grill/flext/build/make-win-pd-bcc.inc b/externals/grill/flext/build/make-win-pd-bcc.inc new file mode 100644 index 00000000..bcc062eb --- /dev/null +++ b/externals/grill/flext/build/make-win-pd-bcc.inc @@ -0,0 +1,35 @@ +DEFS=$(DEFS) /DFLEXT_SYS=2 + +INCPATH=$(INCPATH) -I$(PDPATH)\src + +# these are both in FLEXTPATH +LIBS=$(LIBS) pd.lib pthreadVC.lib + +EXT=dll + +######################################### + +!ifdef SHARED +# --- shared --- + +!else +!ifdef THREADED +# --- static multi-threaded --- + +!ifdef DEBUG +LIBS=$(LIBS) flext_td-pdwin.lib +!else +LIBS=$(LIBS) flext_t-pdwin.lib +!endif + +!else +# --- static single-threaded --- + +!ifdef DEBUG +LIBS=$(LIBS) flext_d-pdwin.lib +!else +LIBS=$(LIBS) flext-pdwin.lib +!endif + +!endif +!endif diff --git a/externals/grill/flext/build/make-win-pd-cygwin.inc b/externals/grill/flext/build/make-win-pd-cygwin.inc new file mode 100644 index 00000000..e8913af7 --- /dev/null +++ b/externals/grill/flext/build/make-win-pd-cygwin.inc @@ -0,0 +1,43 @@ +DEFS += -DFLEXT_SYS=2 + +INCPATH += -I$(PDPATH)/src +LIBPATH += -L$(PDPATH)/bin + +LDFLAGS += + +LIBS += + +EXT=dll + +######################################### + +ifdef SHARED +# --- shared --- + +ifdef DEBUG +LIBS += -lflext_d +else +LIBS += -lflext +endif + +else +ifdef THREADED +# --- static multi-threaded --- + +ifdef DEBUG +LIBS += $(FLEXTPATH)/libflext_td.a +else +LIBS += $(FLEXTPATH)/libflext_t.a +endif + +else +# --- static single-threaded --- + +ifdef DEBUG +LIBS += $(FLEXTPATH)/libflext_d.a +else +LIBS += $(FLEXTPATH)/libflext.a +endif + +endif +endif diff --git a/externals/grill/flext/build/make-win-pd-mingw.inc b/externals/grill/flext/build/make-win-pd-mingw.inc new file mode 100644 index 00000000..a49e5b7a --- /dev/null +++ b/externals/grill/flext/build/make-win-pd-mingw.inc @@ -0,0 +1,34 @@ +DEFS += -DFLEXT_SYS=2 + +INCPATH += -I$(PDPATH)/src +LIBPATH += -L$(PDPATH)/bin + +# these are both in PDPATH +LIBS += -lpd -lpthreadVC + +EXT=dll + +######################################### + +ifdef SHARED +# --- shared --- + +elseifdef THREADED +# --- static multi-threaded --- + +ifdef DEBUG +LIBS += -lflext_td-pdwin +else +LIBS += -lflext_t-pdwin +endif + +else +# --- static single-threaded --- + +ifdef DEBUG +LIBS += -lflext_d-pdwin +else +LIBS += -lflext-pdwin +endif + +endif diff --git a/externals/grill/flext/build/make-win-pd-msvc.inc b/externals/grill/flext/build/make-win-pd-msvc.inc index 41cbfd20..cec66266 100644 --- a/externals/grill/flext/build/make-win-pd-msvc.inc +++ b/externals/grill/flext/build/make-win-pd-msvc.inc @@ -10,13 +10,13 @@ EXT=dll ######################################### -!ifdef FLEXT_SHARED +!ifdef SHARED # --- shared --- -!elseifdef FLEXT_THREADED +!elseifdef THREADED # --- static multi-threaded --- -!ifdef _DEBUG +!ifdef DEBUG LIBS=$(LIBS) flext_td-pdwin.lib !else LIBS=$(LIBS) flext_t-pdwin.lib @@ -25,7 +25,7 @@ LIBS=$(LIBS) flext_t-pdwin.lib !else # --- static single-threaded --- -!ifdef _DEBUG +!ifdef DEBUG LIBS=$(LIBS) flext_d-pdwin.lib !else LIBS=$(LIBS) flext-pdwin.lib diff --git a/externals/grill/flext/build/nmake.mak b/externals/grill/flext/build/nmake.mak new file mode 100644 index 00000000..c8c599f1 --- /dev/null +++ b/externals/grill/flext/build/nmake.mak @@ -0,0 +1,30 @@ +# PLATFORM - win/mac/lnx +# RTSYS - pd/max +# COMPILER - msvc/gcc/mingw/cygwin + +# general settings +!include config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt + +############################### + +# these are project specific + +# special package settings +!if exist(config-$(PLATFORM)-$(COMPILER).txt) +!include config-$(PLATFORM)-$(COMPILER).txt +!endif + +# package specific make stuff +!if exist(makefile-$(PLATFORM)-$(COMPILER).txt) +!include makefile-$(PLATFORM)-$(COMPILER).txt +!endif + +# package info +!include make-files.txt + +############################## + +# platform-specific make stuff +!include make-$(PLATFORM)-$(RTSYS)-$(COMPILER).inc +# general make stuff +!include make-$(PLATFORM)-gen-$(COMPILER).inc diff --git a/externals/grill/flext/config-pd-bcc.txt b/externals/grill/flext/config-pd-bcc.txt index 3bc58f50..5d111ed5 100644 --- a/externals/grill/flext/config-pd-bcc.txt +++ b/externals/grill/flext/config-pd-bcc.txt @@ -10,11 +10,11 @@ BCCPATH=c:\programme\prog\bcc55 # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) -SNDOBJ=f:\prog\audio\sndobj\include +SNDOBJ=c:\data\prog\audio\sndobj\include # where is the STK include directory? # (leave blank or comment out to disable STK support) -STK=f:\pprog\audio\stk\include +STK=c:\data\prog\audio\stk\include # build directory for flext libraries? OUTPATH=.\pd-bcc @@ -22,6 +22,3 @@ OUTPATH=.\pd-bcc # where should flext libraries be installed? # (leave blank to omit installation) INSTDIR=$(PDPATH)\flext - - - diff --git a/externals/grill/flext/config-pd-darwin.txt b/externals/grill/flext/config-pd-darwin.txt index 5f60ce4a..32811383 100644 --- a/externals/grill/flext/config-pd-darwin.txt +++ b/externals/grill/flext/config-pd-darwin.txt @@ -6,7 +6,7 @@ # CXX=g++-3.3 # where are the PD header files? (m_pd.h, m_imp.h, g_canvas.h) -PDPATH=../../../pd/src +PDPATH=/Applications/Pd-0.38-0test10.app/Contents/Resources/src # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) @@ -21,7 +21,7 @@ TARGDIR=./pd-darwin # where should flext libraries be installed? # (leave blank to omit installation) -INSTDIR=/usr/local/lib/pd/flext +INSTDIR=/Applications/Pd-0.38-0test10.app/Contents/Resources/flext # additional compiler flags # (check if they fit for your system!) diff --git a/externals/grill/flext/flext.vcproj b/externals/grill/flext/flext.vcproj index c4426b2d..1d026be6 100644 --- a/externals/grill/flext/flext.vcproj +++ b/externals/grill/flext/flext.vcproj @@ -175,7 +175,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS=2;FLEXT_USE_SIMD" StringPooling="TRUE" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="1" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" @@ -276,7 +276,7 @@ AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLEXT_SYS=2;FLEXT_USE_SIMD" StringPooling="TRUE" - RuntimeLibrary="4" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" diff --git a/externals/grill/flext/flext.xcode/project.pbxproj b/externals/grill/flext/flext.xcode/project.pbxproj index a7d128b7..d8b23073 100755 --- a/externals/grill/flext/flext.xcode/project.pbxproj +++ b/externals/grill/flext/flext.xcode/project.pbxproj @@ -227,7 +227,6 @@ HEADER_SEARCH_PATHS = "$(PD)/src"; INSTALL_PATH = /usr/local/lib; LIBRARY_STYLE = STATIC; - OPTIMIZATION_CFLAGS = ""; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = flext_s; @@ -997,7 +996,6 @@ HEADER_SEARCH_PATHS = "$(PD)/src"; INSTALL_PATH = /usr/local/lib; LIBRARY_STYLE = BUNDLE; - OPTIMIZATION_CFLAGS = ""; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-bundle_loader $(PD)/bin/pd"; OTHER_REZFLAGS = ""; diff --git a/externals/grill/flext/make-files.txt b/externals/grill/flext/make-files.txt index db310c50..38bc36af 100644 --- a/externals/grill/flext/make-files.txt +++ b/externals/grill/flext/make-files.txt @@ -1,3 +1,5 @@ +SRCDIR=source + SRCS= \ flbase.cpp flext.cpp flbuf.cpp fldsp.cpp fllib.cpp \ flxlet.cpp flattr.cpp flattr_ed.cpp flsupport.cpp \ diff --git a/externals/grill/flext/make-inc.pd-bcc b/externals/grill/flext/make-inc.pd-bcc new file mode 100644 index 00000000..8c555073 --- /dev/null +++ b/externals/grill/flext/make-inc.pd-bcc @@ -0,0 +1,92 @@ +# flext - C++ layer for Max/MSP and pd (pure data) externals +# Copyright (c) 2001-2004 Thomas Grill (gr@grrrr.org) +# +# Makefile for BorlandC++ +# +# usage: make -f makefile.bcc + +!include config-pd-bcc.txt + +TARGET=pdwin # appendix to lib name + +# includes +INCPATH=-I$(BCCPATH)\include -I$(PDPATH)\src -I$(SRCDIR) + +# compiler definitions and flags +DEFS=-DFLEXT_SYS=2 +CFLAGS=-tWD + +!ifdef DEBUG +CFLAGS=$(CFLAGS) -v +DEFS=$(DEFS) -DFLEXT_DEBUG +!else +CFLAGS=$(CFLAGS) -6 -O2 -OS -ff +!endif + +!ifdef THREADED +CFLAGS=$(CFLAGS) -tWM +DEFS=$(DEFS) -DFLEXT_THREADS +!endif + + +# the rest can stay untouched +# ---------------------------------------------- + +# all the source files from the package +!include make-files.txt + +!ifdef SNDOBJ +INCPATH=$(INCPATH) -I$(SNDOBJ) +SRCS=$(SRCS) $(SRCS_SNDOBJ) +HDRS=$(HDRS) $(HDRS_SNDOBJ) +!endif + +!ifdef STK +INCPATH=$(INCPATH) -I$(STK) +SRCS=$(SRCS) $(SRCS_STK) +HDRS=$(HDRS) $(HDRS_STK) +!endif + +TARGET=$(OUTPATH)\$(NAME)-$(TARGET).lib + +#default target +all: $(OUTPATH) $(TARGET) $(OUTPATH)\pd.lib $(OUTPATH)\pthreadVC.lib + +# remove build +clean: + -del /s /q $(OUTPATH) > nul + rmdir $(OUTPATH) + +# ----------------------------------------------- + +OBJS= $(SRCS:.cpp=.obj) + +#.PATH.obj=$(OUTPATH) + + +DIR="/" + +$(OUTPATH)\pd.lib: $(PDPATH)\bin\pd.dll + implib -a $< $** + +$(OUTPATH)\pthreadVC.lib: $(PDPATH)\bin\pthreadVC.dll + implib -a $< $** + +{$(SRCDIR)}.cpp.obj: + bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(OUTPATH) $< + +$(OUTPATH): + @-if not exist $< mkdir $< + +$(TARGET): $(OBJS) + @-del "$<" + cd $(OUTPATH) + tlib "..\$<" +$(**: = +) + cd .. +!if $d(INSTDIR) && "$(INSTDIR)" != "" + @-if not exist $(INSTDIR) mkdir $(INSTDIR) + -copy $< $(INSTDIR) >nul + -copy $(OUTPATH)\pd.lib $(INSTDIR) >nul + -copy $(OUTPATH)\pthreadVC.lib $(INSTDIR) >nul + -copy $(SRCDIR)\*.h $(INSTDIR) >nul +!endif diff --git a/externals/grill/flext/makefile.pd-bcc b/externals/grill/flext/makefile.pd-bcc index f7899c66..5bb5af62 100644 --- a/externals/grill/flext/makefile.pd-bcc +++ b/externals/grill/flext/makefile.pd-bcc @@ -1,88 +1,29 @@ # flext - C++ layer for Max/MSP and pd (pure data) externals -# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2001-2004 Thomas Grill (gr@grrrr.org) # -# Makefile for BorlandC++ +# Makefile for BCC++ # -# usage: make -f makefile.bcc # -# --------------------------------------------- +# IMPORTANT: Adjust some of the paths also in makefile-inc.bcc # -# note: no threading support for BorlandC++ +# usage: make -f makefile.pd-bcc # -# --------------------------------------------- +# --------------------------------------------------------------- -!include config-pd-bcc.txt +all: flext flext_t flext_d flext_td -SOURCE=source +flext: + make /f make-inc.pd-bcc NAME=$* -NAME=flext -TARGET=pdwin # appendix to lib name +flext_d: + make /f make-inc.pd-bcc NAME=$* DEBUG=1 -# includes -INCPATH=-I$(BCCPATH)\include -I$(PDPATH)\src -I$(SOURCE) +flext_t: + make /f make-inc.pd-bcc NAME=$* THREADED=1 -!ifdef SNDOBJ -INCPATH=$(INCPATH) -I$(SNDOBJ) -!endif +flext_td: + make /f make-inc.pd-bcc NAME=$* THREADED=1 DEBUG=1 -# compiler definitions and flags -DEFS=-DFLEXT_SYS=2 -CFLAGS=-6 -O2 -OS -ff -tWD - - -# the rest can stay untouched -# ---------------------------------------------- - -# all the source files from the package -!include make-files.txt - -!ifdef SNDOBJ -SRCS=$(SRCS) $(SRCS_SNDOBJ) -HDRS=$(HDRS) $(HDRS_SNDOBJ) -!endif - -#default target -all: $(OUTPATH)\$(NAME)-$(TARGET).lib - -# remove build clean: - -del /s /q $(OUTPATH) > nul - rmdir $(OUTPATH) - -# ----------------------------------------------- - -OBJS= $(SRCS:.cpp=.obj) - -#.PATH.obj=$(OUTPATH) - - -DIR="/" - -{$(SOURCE)}.cpp.obj: - bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(OUTPATH) $< - -$(OUTPATH): - @if not exist $< mkdir $< - -$(OUTPATH)\$(NAME)-$(TARGET).lib:: $(OUTPATH) - -$(OUTPATH)\$(NAME)-$(TARGET).lib:: $(OBJS) - @-del "$<" - cd $(OUTPATH) - tlib "..\$<" +$(**: = +) - cd .. -!if $d(INSTDIR) && "$(INSTDIR)" != "" - @-if not exist $(INSTDIR) mkdir $(INSTDIR) - copy $< $(INSTDIR) >nul - copy $(SOURCE)\*.h $(INSTDIR) >nul -!endif - - - - - - - - - + make /f make-inc.pd-bcc clean diff --git a/externals/grill/flext/source/flthr.cpp b/externals/grill/flext/source/flthr.cpp index 8a7a841f..fe70dfdd 100644 --- a/externals/grill/flext/source/flthr.cpp +++ b/externals/grill/flext/source/flthr.cpp @@ -604,12 +604,17 @@ bool flext::ThrCond::Wait() { return ret; } -bool flext::ThrCond::TimedWait(double ftime) +bool flext::ThrCond::TimedWait(double ftm) { timespec tm; #if FLEXT_OS == FLEXT_OS_WIN && FLEXT_OSAPI == FLEXT_OSAPI_WIN_NATIVE +#ifdef _MSC_VER _timeb tmb; _ftime(&tmb); +#else + timeb tmb; + ftime(&tmb); +#endif tm.tv_nsec = tmb.millitm*1000000; tm.tv_sec = tmb.time; #else // POSIX @@ -623,9 +628,9 @@ bool flext::ThrCond::TimedWait(double ftime) #endif #endif - tm.tv_nsec += (long)((ftime-(long)ftime)*1.e9); + tm.tv_nsec += (long)((ftm-(long)ftm)*1.e9); long nns = tm.tv_nsec%1000000000; - tm.tv_sec += (long)ftime+(tm.tv_nsec-nns)/1000000000; + tm.tv_sec += (long)ftm+(tm.tv_nsec-nns)/1000000000; tm.tv_nsec = nns; Lock(); -- cgit v1.2.1