Pd-cvs January 2005

pd-cvs@lists.iem.at

8 participants
348 discussions

externals/grill/flext/buildsys/mac/pd gnumake-gcc-ext.inc,NONE,1.1 gnumake-gcc-flext.inc,NONE,1.1 gnumake-gcc.inc,NONE,1.1 config-gcc.def,1.2,1.3 make-gcc.inc,1.1,NONE
by Thomas Grill 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/mac/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29038/buildsys/mac/pd Modified Files: config-gcc.def Added Files: gnumake-gcc-ext.inc gnumake-gcc-flext.inc gnumake-gcc.inc Removed Files: make-gcc.inc Log Message: updated make system build system for OSX simplified make system reconsidered flext::buffer:Update added object construction and destruction flags updated build system --- NEW FILE: gnumake-gcc.inc --- DEFS += -DFLEXT_SYS=2 INCPATH += -I$(PDPATH)/src LIBPATH += -L$(PDPATH)/bin LDFLAGS += -bundle -bundle_loader $(PDBIN) ############################################## OBJPATH=$(OUTPATH)/$(OUTSUB) TARGETPATH=$(OBJPATH) TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) --- NEW FILE: gnumake-gcc-ext.inc --- EXT=pd_darwin Index: config-gcc.def =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/mac/pd/config-gcc.def,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config-gcc.def 30 Dec 2004 04:58:25 -0000 1.2 --- config-gcc.def 3 Jan 2005 05:00:28 -0000 1.3 *************** *** 1,17 **** # where is the PD installation including source code? ! PDPATH=/Applications/Pd-0.38-0test10.app/Contents/Resources # 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!) --- 1,29 ---- # where is the PD installation including source code? ! PDPATH=/Applications/audio/Pd-0.38-0test13.app/Contents/Resources # where is the PD executable? ! PDBIN=$(PDPATH)/bin/pd ! ############################################################### ! # where do/should the flext headers reside/be built? ! FLEXTINC=/usr/local/include/flext ! ! # where do/should the flext static libraries reside/be built? ! FLEXTLIB=/usr/local/lib ! ! # where do/should the flext shared libraries reside/be built? ! FLEXTSHLIB=$(FLEXTLIB) ! ! ############################################################### # where should the external be built? OUTPATH=pd-darwin + # where should the external be installed? + INSTPATH=$(PDPATH)/extra + + ############################################################### + # user defined compiler flags # (check if they match your system!) --- make-gcc.inc DELETED --- --- NEW FILE: gnumake-gcc-flext.inc --- ifdef SHARED EXT=dylib else EXT=a endif

1 0

externals/grill/flext/buildsys/mac gnumake-gcc-ext.inc,NONE,1.1 gnumake-gcc-flext.inc,NONE,1.1 gnumake-gcc.inc,NONE,1.1 make-gcc.inc,1.2,NONE
by Thomas Grill 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29038/buildsys/mac Added Files: gnumake-gcc-ext.inc gnumake-gcc-flext.inc gnumake-gcc.inc Removed Files: make-gcc.inc Log Message: updated make system build system for OSX simplified make system reconsidered flext::buffer:Update added object construction and destruction flags updated build system --- NEW FILE: gnumake-gcc.inc --- ############################################## LDFLAGS += -dynamic -Wl,-x -framework ApplicationServices -framework vecLib ############################################## ifndef DEBUG CFLAGS += -g -D_DEBUG else CFLAGS += $(OFLAGS) -DNDEBUG LDFLAGS += -Wl,-S endif --- NEW FILE: gnumake-gcc-ext.inc --- # build class specific settings INCPATH += -I$(FLEXTINC) LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB) LIBS += -l$(FLEXTNAME) ############################################## 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 $@ $(OBJPATH)/%.opp : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ $(OBJPATH)/%.o : $(SRCDIR)/%.c $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ $(TARGET) :: $(OBJPATH) $(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) --- make-gcc.inc DELETED --- --- NEW FILE: gnumake-gcc-flext.inc --- # build class specific settings #LDFLAGS += -dylib_install_name $(FLEXTSHLIB) ############################################## 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 $@ $(OBJPATH)/%.opp : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ $(OBJPATH)/%.o : $(SRCDIR)/%.c $(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@ $(TARGET) :: $(OBJPATH) $(TARGETPATH) $(TARGET) :: $(COBJS) $(CPPOBJS) ifdef SHARED $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) chmod 755 $@ else libtool -static -o $@ $(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) ifndef SHARED ranlib $(FLEXTLIBINST)/$(OUTNAME).$(EXT) # have to rerun ranlib at install dir ?! endif install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)

1 0

externals/grill/flext/buildsys/lnx gnumake-gcc-ext.inc,NONE,1.1 gnumake-gcc-flext.inc,NONE,1.1 gnumake-gcc.inc,NONE,1.1 make-gcc.inc,1.1,NONE
by Thomas Grill 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/lnx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29038/buildsys/lnx Added Files: gnumake-gcc-ext.inc gnumake-gcc-flext.inc gnumake-gcc.inc Removed Files: make-gcc.inc Log Message: updated make system build system for OSX simplified make system reconsidered flext::buffer:Update added object construction and destruction flags updated build system --- NEW FILE: gnumake-gcc.inc --- ############################################## TARGETPATH=$(OUTPATH)/$(OUTSUB) TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) ############################################## LDFLAGS += -shared -Wl,-x ############################################## ifdef DEBUG CFLAGS += -g -D_DEBUG else CFLAGS += $(OFLAGS) -DNDEBUG LDFLAGS += -Wl,-S 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))) --- NEW FILE: gnumake-gcc-ext.inc --- # 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) --- make-gcc.inc DELETED --- --- NEW FILE: gnumake-gcc-flext.inc --- # 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)

1 0

externals/grill/flext/buildsys/lnx/pd gnumake-gcc-ext.inc,NONE,1.1 gnumake-gcc-flext.inc,NONE,1.1 gnumake-gcc.inc,NONE,1.1 config-gcc.def,1.1,1.2 make-gcc.inc,1.1,NONE
by Thomas Grill 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29038/buildsys/lnx/pd Modified Files: config-gcc.def Added Files: gnumake-gcc-ext.inc gnumake-gcc-flext.inc gnumake-gcc.inc Removed Files: make-gcc.inc Log Message: updated make system build system for OSX simplified make system reconsidered flext::buffer:Update added object construction and destruction flags updated build system --- NEW FILE: gnumake-gcc.inc --- DEFS += -DFLEXT_SYS=2 INCPATH += -I$(PDPATH)/src LIBPATH += -L$(PDPATH)/bin --- NEW FILE: gnumake-gcc-ext.inc --- EXT=pd_linux Index: config-gcc.def =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/pd/config-gcc.def,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config-gcc.def 20 Dec 2004 05:06:17 -0000 1.1 --- config-gcc.def 3 Jan 2005 05:00:27 -0000 1.2 *************** *** 1,14 **** # 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!) --- 1,26 ---- # where is the PD source package? ! PDPATH=/usr/local/src/pd ! ############################################################### ! # where do/should the flext headers reside/be built? ! FLEXTINC=/usr/local/include/flext ! ! # where do/should the flext static libraries reside/be built? ! FLEXTLIB=/usr/local/lib ! ! # where do/should the flext shared libraries reside/be built? ! FLEXTSHLIB=$(FLEXTLIB) ! ! ############################################################### # where should the external be built? OUTPATH=pd-linux + # where should the external be installed? + INSTPATH=/usr/local/lib/pd/extra + + ############################################################### + # user defined compiler flags # (check if they match your system!) --- make-gcc.inc DELETED --- --- NEW FILE: gnumake-gcc-flext.inc --- ifdef SHARED EXT=so else EXT=a endif

1 0

externals/grill/flext build.bat,1.1,1.2 build.sh,1.1,1.2 changes.txt,1.65,1.66 config-pd-darwin.txt,1.19,1.20 package.txt,1.1,1.2
by Thomas Grill 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29038 Modified Files: build.bat build.sh changes.txt config-pd-darwin.txt package.txt Log Message: updated make system build system for OSX simplified make system reconsidered flext::buffer:Update added object construction and destruction flags updated build system Index: package.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/package.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.txt 20 Dec 2004 05:06:14 -0000 1.1 --- package.txt 3 Jan 2005 05:00:25 -0000 1.2 *************** *** 1,7 **** NAME=flext ! FLEXTBUILD=1 - BUILDDIR=build SRCDIR=source --- 1,8 ---- NAME=flext ! BUILDCLASS=flext ! BUILDMODE=all ! BUILDTYPE=all SRCDIR=source Index: build.sh =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/build.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.sh 20 Dec 2004 05:06:14 -0000 1.1 --- build.sh 3 Jan 2005 05:00:25 -0000 1.2 *************** *** 6,10 **** # $2 - system (pd/max) # $3 - compiler (msvc/gcc/mingw/cygwin/bcc/icc) ! # $4 - target (all/all-debug/all-shared/all-shared-debug/clean/install) platform=$1 --- 6,10 ---- # $2 - system (pd/max) # $3 - compiler (msvc/gcc/mingw/cygwin/bcc/icc) ! # $4 - target (build/clean/install) platform=$1 *************** *** 26,31 **** echo system ..... pd / max echo compiler ... msvc / gcc / mingw / cygwin / bcc / icc ! echo target ..... all $default$ / all-debug / all-shared / all-shared-debug / ! echo ............ clean / install echo echo Please make sure that your make program and compiler can be accessed with the --- 26,30 ---- echo system ..... pd / max echo compiler ... msvc / gcc / mingw / cygwin / bcc / icc ! echo target ..... build $default$ / clean / install echo echo Please make sure that your make program and compiler can be accessed with the Index: build.bat =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/build.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.bat 20 Dec 2004 05:06:14 -0000 1.1 --- build.bat 3 Jan 2005 05:00:16 -0000 1.2 *************** *** 5,9 **** @rem %2 - system (pd/max) @rem %3 - compiler (msvc/gcc/mingw/cygwin/bcc/icc) ! @rem %4 - target (all/all-debug/all-shared/all-shared-debug/clean/install) @set platform=%1 --- 5,9 ---- @rem %2 - system (pd/max) @rem %3 - compiler (msvc/gcc/mingw/cygwin/bcc/icc) ! @rem %4 - target (build/clean/install) @set platform=%1 Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** changes.txt 31 Dec 2004 04:58:28 -0000 1.65 --- changes.txt 3 Jan 2005 05:00:25 -0000 1.66 *************** *** 1,5 **** flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 1,5 ---- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (c) 2001-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 24,28 **** - added global system locking - added general atom outlet functions To{Sys,Out,Queue}Atom ! - added build system for flext-based externals - flags for object construction and destruction phase (Initing() and Exiting()) - reconsidered flext::buffer::Update --- 24,28 ---- - added global system locking - added general atom outlet functions To{Sys,Out,Queue}Atom ! - new build system for flext and flext-based externals - flags for object construction and destruction phase (Initing() and Exiting()) - reconsidered flext::buffer::Update Index: config-pd-darwin.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/config-pd-darwin.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** config-pd-darwin.txt 18 Dec 2004 05:00:55 -0000 1.19 --- config-pd-darwin.txt 3 Jan 2005 05:00:25 -0000 1.20 *************** *** 7,11 **** # where are the PD header files? (m_pd.h, m_imp.h, g_canvas.h) ! PDPATH=/Applications/Pd-0.38-0test10.app/Contents/Resources/src # where is the SndObj include directory? --- 7,11 ---- # where are the PD header files? (m_pd.h, m_imp.h, g_canvas.h) ! PDPATH=/Applications/audio/Pd-0.38-0test13.app/Contents/Resources/src # where is the SndObj include directory? *************** *** 22,26 **** # where should flext libraries be installed? # (leave blank to omit installation) ! INSTDIR=/Applications/Pd-0.38-0test10.app/Contents/Resources/flext # additional compiler flags --- 22,26 ---- # where should flext libraries be installed? # (leave blank to omit installation) ! INSTDIR=/Applications/audio/Pd-0.38-0test10.app/Contents/Resources/flext # additional compiler flags

1 0

externals/grill/flext/buildsys bmake-ext.inc,NONE,1.1 bmake.inc,NONE,1.1 gnumake-ext.inc,NONE,1.1 gnumake.inc,NONE,1.1 nmake-ext.inc,NONE,1.1 nmake.inc,NONE,1.1 targets-ext.inc,NONE,1.1 targets-flext.inc,NONE,1.1 targets.inc,NONE,1.1 bmake-flext.inc,1.1,1.2 bmake-sub.mak,1.1,1.2 bmake.mak,1.1,1.2 gnumake-flext.inc,1.1,1.2 gnumake-sub.mak,1.1,1.2 gnumake.mak,1.1,1.2 nmake-flext.inc,1.1,1.2 nmake-sub.mak,1.1,1.2 nmake.mak,1.1,1.2
by Thomas Grill 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29038/buildsys Modified Files: bmake-flext.inc bmake-sub.mak bmake.mak gnumake-flext.inc gnumake-sub.mak gnumake.mak nmake-flext.inc nmake-sub.mak nmake.mak Added Files: bmake-ext.inc bmake.inc gnumake-ext.inc gnumake.inc nmake-ext.inc nmake.inc targets-ext.inc targets-flext.inc targets.inc Log Message: updated make system build system for OSX simplified make system reconsidered flext::buffer:Update added object construction and destruction flags updated build system --- NEW FILE: gnumake-ext.inc --- OUTNAME=$(NAME) Index: bmake.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/bmake.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bmake.mak 20 Dec 2004 05:06:16 -0000 1.1 --- bmake.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 6,23 **** # BUILDPATH including trailing \ # package info USRINFO=package.txt !include $(USRINFO) SYSCONFIG=$(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def - OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO) !ifdef BUILDDIR --- 6,51 ---- # BUILDPATH including trailing \ + ############################################### # package info + USRINFO=package.txt !include $(USRINFO) + ############################################### + # check variables + + !ifndef BUILDCLASS + !error BUILDCLASS must be specified in $(USRINFO) + !endif + + !ifndef BUILDMODE + !error BUILDMODE must be specified in $(USRINFO) + !endif + + !ifndef BUILDTYPE + !error BUILDTYPE must be specified in $(USRINFO) + !endif + + ############################## + + !ifndef TARGETMODE + TARGETMODE=$(BUILDMODE) + !endif + + !ifndef TARGETTYPE + TARGETTYPE=$(BUILDTYPE) + !endif + + ############################################### SYSCONFIG=$(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO) + ############################################### !ifdef BUILDDIR *************** *** 30,112 **** !endif ! !ifdef FLEXTBUILD ! all: flext ! !else ! all: build-sr ! ! shared: build-tr ! !endif ! ! flext: flext-release flext-debug ! ! flext-release: build-dr build-tr build-sr ! ! flext-debug: build-dd build-td build-sd ! ! install: install-dr install-tr install-sr install-dd install-td install-sd ! ! clean: clean-dr clean-tr clean-sr clean-dd clean-td clean-sd ! ! ! build-sr: config ! $(MAKE) $(OPTIONS) _all_ ! ! build-sd: config ! $(MAKE) $(OPTIONS) DEBUG=1 _all_ ! ! build-tr: config ! $(MAKE) $(OPTIONS) THREADED=1 _all_ ! ! build-td: config ! $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _all_ ! ! build-dr: config ! $(MAKE) $(OPTIONS) SHARED=1 _all_ ! ! build-dd: config ! $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _all_ ! ! ! install-sr: ! $(MAKE) $(OPTIONS) _install_ ! ! install-sd: ! $(MAKE) $(OPTIONS) DEBUG=1 _install_ ! ! install-tr: ! $(MAKE) $(OPTIONS) THREADED=1 _install_ ! ! install-td: ! $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _install_ ! ! install-dr: ! $(MAKE) $(OPTIONS) SHARED=1 _install_ ! ! install-dd: ! $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _install_ ! ! ! clean-sr: ! $(MAKE) $(OPTIONS) _clean_ ! ! clean-sd: ! $(MAKE) $(OPTIONS) DEBUG=1 _clean_ ! ! clean-tr: ! $(MAKE) $(OPTIONS) THREADED=1 _clean_ ! ! clean-td: ! $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _clean_ ! ! clean-dr: ! $(MAKE) $(OPTIONS) SHARED=1 _clean_ ! ! clean-dd: ! $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _clean_ ! ! config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) .precious: $(SYSCONFIG) $(USRCONFIG) --- 58,69 ---- !endif + ############################################### + # include file describing default target dependencies ! !include $(BUILDPATH)targets.inc ! !include $(BUILDPATH)targets-$(BUILDCLASS).inc + ############################################### .precious: $(SYSCONFIG) $(USRCONFIG) --- NEW FILE: bmake.inc --- ############################################## # 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) --- NEW FILE: bmake-ext.inc --- OUTNAME=$(NAME) Index: gnumake-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake-flext.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake-flext.inc 20 Dec 2004 05:06:16 -0000 1.1 --- gnumake-flext.inc 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 1,89 **** - ############################################## - # flext defines - ############################################## - - ifdef SHARED - # --- shared --- - DEFS+=-DFLEXT_SHARED - - else - ifdef THREADED - # --- static multi-threaded --- - DEFS+=-DFLEXT_THREADS - - else - # --- static single-threaded --- - - endif - endif - - - ifdef FLEXTBUILD DEFS+=-DFLEXT_EXPORTS - 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)_d - else - FLEXTNAME=flext-$(RTSYS) - endif - endif - - endif # SHARED - - ############################################## - # build subdirectories - ############################################## - - ifdef FLEXTBUILD - - ifdef SHARED - - ifdef DEBUG - OUTSUB=dd - else - OUTSUB=dr - endif ! else # SHARED ! ! ifdef THREADED ! ifdef DEBUG ! OUTSUB=td ! else ! OUTSUB=tr ! endif ! else ! ifdef DEBUG ! OUTSUB=sd ! else ! OUTSUB=sr ! endif ! endif ! ! endif # SHARED ! ! else # FLEXTBUILD ! OUTSUB=. ! endif # FLEXTBUILD --- 1,3 ---- DEFS+=-DFLEXT_EXPORTS ! OUTNAME=lib$(FLEXTNAME) Index: gnumake-sub.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake-sub.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake-sub.mak 20 Dec 2004 05:06:16 -0000 1.1 --- gnumake-sub.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 3,8 **** ############################### ! ! # these are project specific # package info --- 3,7 ---- ############################### ! # project specific definitions # package info *************** *** 11,29 **** # special settings ifdef USRCONFIG ! include $(USRCONFIG) endif # package specific make stuff ifdef USRMAKE ! include $(USRMAKE) endif ############################## ! # flext-specific make stuff ! include $(BUILDPATH)gnumake-flext.inc # platform-specific make stuff ! include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/make-$(COMPILER).inc # general make stuff ! include $(BUILDPATH)$(PLATFORM)/make-$(COMPILER).inc --- 10,61 ---- # special settings ifdef USRCONFIG ! include $(USRCONFIG) endif # package specific make stuff ifdef USRMAKE ! include $(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 + + ############################## # platform-specific make stuff ! ! include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER)-$(BUILDCLASS).inc ! ! include $(BUILDPATH)$(PLATFORM)/$(RTSYS)/gnumake-$(COMPILER).inc ! ! ############################## # general make stuff ! ! include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER)-$(BUILDCLASS).inc ! ! include $(BUILDPATH)$(PLATFORM)/gnumake-$(COMPILER).inc --- NEW FILE: nmake-ext.inc --- OUTNAME=$(NAME) Index: bmake-sub.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/bmake-sub.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bmake-sub.mak 20 Dec 2004 05:06:16 -0000 1.1 --- bmake-sub.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 1,7 **** !include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt ############################### ! ! # these are project specific # package info --- 1,7 ---- + # general settings !include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt ############################### ! # project-specific definitions # package info *************** *** 20,28 **** ############################## # flext-specific make stuff - !include $(BUILDPATH)bmake-flext.inc # platform-specific make stuff ! !include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\make-$(COMPILER).inc # general make stuff ! !include $(BUILDPATH)$(PLATFORM)\make-$(COMPILER).inc --- 20,61 ---- ############################## + !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 + + ############################## # platform-specific make stuff ! ! !include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\bmake-$(COMPILER)-$(BUILDCLASS).inc ! ! !include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\bmake-$(COMPILER).inc ! ! ############################## # general make stuff ! ! !include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER)-$(BUILDCLASS).inc ! ! !include $(BUILDPATH)$(PLATFORM)\bmake-$(COMPILER).inc Index: bmake-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/bmake-flext.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bmake-flext.inc 20 Dec 2004 05:06:16 -0000 1.1 --- bmake-flext.inc 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 1,90 **** - ############################################## - # 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 - - - !ifdef FLEXTBUILD DEFS=$(DEFS) /DFLEXT_EXPORTS - !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)_d - !else - FLEXTNAME=flext-$(RTSYS) - !endif - !endif - - !endif # SHARED - - ############################################## - # build subdirectories - ############################################## - - !ifdef FLEXTBUILD - - !ifdef SHARED - - !ifdef DEBUG - OUTSUB=dd - !else - OUTSUB=dr - !endif - - !else # SHARED - - !ifdef THREADED - !ifdef DEBUG - OUTSUB=td - !else - OUTSUB=tr - !endif - !else - !ifdef DEBUG - OUTSUB=sd - !else - OUTSUB=sr - !endif - !endif - - !endif # SHARED - - !else # FLEXTBUILD - OUTSUB=. - !endif # FLEXTBUILD --- 1,3 ---- DEFS=$(DEFS) /DFLEXT_EXPORTS + OUTNAME=$(FLEXTNAME) Index: nmake-sub.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/nmake-sub.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nmake-sub.mak 20 Dec 2004 05:06:16 -0000 1.1 --- nmake-sub.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- ############################## + # project-specific definitions # package info *************** *** 19,27 **** ############################## ! # flext-specific make stuff ! !include $(BUILDPATH)nmake-flext.inc # platform-specific make stuff ! !include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\make-$(COMPILER).inc # general make stuff ! !include $(BUILDPATH)$(PLATFORM)\make-$(COMPILER).inc --- 20,61 ---- ############################## ! !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 + + ############################## # platform-specific make stuff ! ! !include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER)-$(BUILDCLASS).inc ! ! !include $(BUILDPATH)$(PLATFORM)\$(RTSYS)\nmake-$(COMPILER).inc ! ! ############################## # general make stuff ! ! !include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER)-$(BUILDCLASS).inc ! ! !include $(BUILDPATH)$(PLATFORM)\nmake-$(COMPILER).inc Index: nmake-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/nmake-flext.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nmake-flext.inc 20 Dec 2004 05:06:16 -0000 1.1 --- nmake-flext.inc 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 1,88 **** - ############################################## - # flext defines - ############################################## - - !ifdef SHARED - # --- shared --- - DEFS=$(DEFS) /DFLEXT_SHARED - - !elseifdef THREADED - # --- static multi-threaded --- - DEFS=$(DEFS) /DFLEXT_THREADS - - !else - # --- static single-threaded --- - - !endif - - - !ifdef FLEXTBUILD DEFS=$(DEFS) /DFLEXT_EXPORTS - !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)_d - !else - FLEXTNAME=flext-$(RTSYS) - !endif - !endif - - !endif # SHARED - - ############################################## - # build subdirectories - ############################################## - - !ifdef FLEXTBUILD - - !ifdef SHARED - - !ifdef DEBUG - OUTSUB=dd - !else - OUTSUB=dr - !endif - - !else # SHARED - - !ifdef THREADED - !ifdef DEBUG - OUTSUB=td - !else - OUTSUB=tr - !endif - !else - !ifdef DEBUG - OUTSUB=sd - !else - OUTSUB=sr - !endif - !endif - - !endif # SHARED - - !else # FLEXTBUILD - OUTSUB=. - !endif # FLEXTBUILD --- 1,3 ---- DEFS=$(DEFS) /DFLEXT_EXPORTS + OUTNAME=$(FLEXTNAME) --- NEW FILE: targets.inc --- all: build-default-default clean: clean-default-default install: install-default-default ########################################################### build-default-default: build-$(TARGETMODE)-$(TARGETTYPE) install-default-default: install-$(TARGETMODE)-$(TARGETTYPE) clean-default-default: clean-$(TARGETMODE)-$(TARGETTYPE) ########################################################### build-release-single: config $(MAKE) $(OPTIONS) _build_ build-debug-single: config $(MAKE) $(OPTIONS) DEBUG=1 _build_ build-release-multi: config $(MAKE) $(OPTIONS) THREADED=1 _build_ build-debug-multi: config $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _build_ build-release-shared: config $(MAKE) $(OPTIONS) SHARED=1 _build_ build-debug-shared: config $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _build_ ########################################################### install-release-single: $(MAKE) $(OPTIONS) _install_ install-debug-single: $(MAKE) $(OPTIONS) DEBUG=1 _install_ install-release-multi: $(MAKE) $(OPTIONS) THREADED=1 _install_ install-debug-multi: $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _install_ install-release-shared: $(MAKE) $(OPTIONS) SHARED=1 _install_ install-debug-shared: $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _install_ ########################################################### clean-release-single: $(MAKE) $(OPTIONS) _clean_ clean-debug-single: $(MAKE) $(OPTIONS) DEBUG=1 _clean_ clean-release-multi: $(MAKE) $(OPTIONS) THREADED=1 _clean_ clean-debug-multi: $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _clean_ clean-release-shared: $(MAKE) $(OPTIONS) SHARED=1 _clean_ clean-debug-shared: $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _clean_ ########################################################### config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) --- NEW FILE: targets-ext.inc --- Index: gnumake.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake.mak 20 Dec 2004 05:06:16 -0000 1.1 --- gnumake.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 6,14 **** --- 6,42 ---- # BUILDPATH including trailing / + ############################################### # package info + USRINFO=package.txt include $(USRINFO) + ############################################### + # check variables + + ifndef BUILDCLASS + error BUILDCLASS must be specified in $(USRINFO) + endif + + ifndef BUILDMODE + error BUILDMODE must be specified in $(USRINFO) + endif + + ifndef BUILDTYPE + error BUILDTYPE must be specified in $(USRINFO) + endif + + ############################## + + ifndef TARGETMODE + TARGETMODE=$(BUILDMODE) + endif + + ifndef TARGETTYPE + TARGETTYPE=$(BUILDTYPE) + endif + + ############################################### ifeq ($(PLATFORM),win) *************** *** 19,31 **** endif SYSCONFIG=$(UBUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt SYSDEFAULT=$(UBUILDPATH)$(PLATFORM)/$(RTSYS)/config-$(COMPILER).def - OPTIONS=-f $(UBUILDPATH)gnumake-sub.mak \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ BUILDPATH=$(UBUILDPATH) USRINFO=$(USRINFO) ifdef BUILDDIR --- 47,60 ---- endif + ############################################### SYSCONFIG=$(UBUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt SYSDEFAULT=$(UBUILDPATH)$(PLATFORM)/$(RTSYS)/config-$(COMPILER).def OPTIONS=-f $(UBUILDPATH)gnumake-sub.mak \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ BUILDPATH=$(UBUILDPATH) USRINFO=$(USRINFO) + ############################################### ifdef BUILDDIR *************** *** 38,121 **** endif ! ifdef FLEXTBUILD ! all: flext ! else ! all: build-sr ! ! shared: build-tr ! endif ! ! flext: flext-release flext-debug ! ! flext-release: build-dr build-tr build-sr ! ! flext-debug: build-dd build-td build-sd ! ! install: install-dr install-tr install-sr install-dd install-td install-sd ! ! clean: clean-dr clean-tr clean-sr clean-dd clean-td clean-sd ! ! ! build-sr: config ! $(MAKE) $(OPTIONS) _all_ ! ! build-sd: config ! $(MAKE) $(OPTIONS) DEBUG=1 _all_ ! ! build-tr: config ! $(MAKE) $(OPTIONS) THREADED=1 _all_ ! ! build-td: config ! $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _all_ ! ! build-dr: config ! $(MAKE) $(OPTIONS) SHARED=1 _all_ ! ! build-dd: config ! $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _all_ ! ! ! install-sr: ! $(MAKE) $(OPTIONS) _install_ ! ! install-sd: ! $(MAKE) $(OPTIONS) DEBUG=1 _install_ ! ! install-tr: ! $(MAKE) $(OPTIONS) THREADED=1 _install_ ! ! install-td: ! $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _install_ ! ! install-dr: ! $(MAKE) $(OPTIONS) SHARED=1 _install_ ! ! install-dd: ! $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _install_ ! ! ! clean-sr: ! $(MAKE) $(OPTIONS) _clean_ ! ! clean-sd: ! $(MAKE) $(OPTIONS) DEBUG=1 _clean_ ! ! clean-tr: ! $(MAKE) $(OPTIONS) THREADED=1 _clean_ ! ! clean-td: ! $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _clean_ ! ! clean-dr: ! $(MAKE) $(OPTIONS) SHARED=1 _clean_ ! ! clean-dd: ! $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _clean_ ! ! ! config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) .precious: $(SYSCONFIG) $(USRCONFIG) --- 67,78 ---- endif + ############################################### + # include file describing default target dependencies ! include $(BUILDPATH)targets.inc ! include $(BUILDPATH)targets-$(BUILDCLASS).inc + ############################################### .precious: $(SYSCONFIG) $(USRCONFIG) --- NEW FILE: nmake.inc --- ############################################## # flext defines ############################################## !ifdef SHARED # --- shared --- DEFS=$(DEFS) /DFLEXT_SHARED !elseifdef THREADED # --- static multi-threaded --- DEFS=$(DEFS) /DFLEXT_THREADS !else # --- static single-threaded --- !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 ############################################## OUTSUB=$(TARGETMODE)-$(TARGETTYPE) --- NEW FILE: targets-flext.inc --- build-default-default: build-all-all install-default-default: install-all-all clean-default-default: clean-all-all ################################################### build-all-all: build-release-all build-debug-all build-release-all: build-release-single build-release-multi build-release-shared build-debug-all: build-debug-single build-debug-multi 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 ################################################### 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 Index: nmake.mak =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/nmake.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nmake.mak 20 Dec 2004 05:06:16 -0000 1.1 --- nmake.mak 3 Jan 2005 05:00:26 -0000 1.2 *************** *** 6,23 **** # BUILDPATH including trailing \ # package info USRINFO=package.txt !include $(USRINFO) SYSCONFIG=$(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def - OPTIONS=-f $(BUILDPATH)nmake-sub.mak \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO) !ifdef BUILDDIR --- 6,51 ---- # BUILDPATH including trailing \ + ############################################### # package info + USRINFO=package.txt !include $(USRINFO) + ############################################### + # check variables + + !ifndef BUILDCLASS + !error BUILDCLASS must be specified in $(USRINFO) + !endif + + !ifndef BUILDMODE + !error BUILDMODE must be specified in $(USRINFO) + !endif + + !ifndef BUILDTYPE + !error BUILDTYPE must be specified in $(USRINFO) + !endif + + ############################## + + !ifndef TARGETMODE + TARGETMODE=$(BUILDMODE) + !endif + + !ifndef TARGETTYPE + TARGETTYPE=$(BUILDTYPE) + !endif + + ############################################### SYSCONFIG=$(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def OPTIONS=-f $(BUILDPATH)nmake-sub.mak \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO) + ############################################### !ifdef BUILDDIR *************** *** 30,113 **** !endif ! !ifdef FLEXTBUILD ! all: flext ! !else ! all: build-sr ! ! shared: build-tr ! !endif ! ! flext: flext-release flext-debug ! ! flext-release: build-dr build-tr build-sr ! ! flext-debug: build-dd build-td build-sd ! ! install: install-dr install-tr install-sr install-dd install-td install-sd ! ! clean: clean-dr clean-tr clean-sr clean-dd clean-td clean-sd ! ! ! build-sr: config ! $(MAKE) $(OPTIONS) _all_ ! ! build-sd: config ! $(MAKE) $(OPTIONS) DEBUG=1 _all_ ! ! build-tr: config ! $(MAKE) $(OPTIONS) THREADED=1 _all_ ! ! build-td: config ! $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _all_ ! ! build-dr: config ! $(MAKE) $(OPTIONS) SHARED=1 _all_ ! ! build-dd: config ! $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _all_ ! ! ! install-sr: ! $(MAKE) $(OPTIONS) _install_ ! ! install-sd: ! $(MAKE) $(OPTIONS) DEBUG=1 _install_ ! ! install-tr: ! $(MAKE) $(OPTIONS) THREADED=1 _install_ ! ! install-td: ! $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _install_ ! ! install-dr: ! $(MAKE) $(OPTIONS) SHARED=1 _install_ ! ! install-dd: ! $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _install_ ! ! ! clean-sr: ! $(MAKE) $(OPTIONS) _clean_ ! ! clean-sd: ! $(MAKE) $(OPTIONS) DEBUG=1 _clean_ ! ! clean-tr: ! $(MAKE) $(OPTIONS) THREADED=1 _clean_ ! ! clean-td: ! $(MAKE) $(OPTIONS) THREADED=1 DEBUG=1 _clean_ ! ! clean-dr: ! $(MAKE) $(OPTIONS) SHARED=1 _clean_ ! ! clean-dd: ! $(MAKE) $(OPTIONS) SHARED=1 DEBUG=1 _clean_ ! ! ! config: $(USRMAKE) $(SYSCONFIG) $(USRCONFIG) .precious: $(SYSCONFIG) $(USRCONFIG) --- 58,69 ---- !endif + ############################################### + # include file describing default target dependencies ! !include $(BUILDPATH)targets.inc ! !include $(BUILDPATH)targets-$(BUILDCLASS).inc + ############################################### .precious: $(SYSCONFIG) $(USRCONFIG) --- NEW FILE: gnumake.inc --- ############################################## # flext defines ############################################## ifdef SHARED # --- shared --- DEFS+=-DFLEXT_SHARED else ifdef THREADED # --- static multi-threaded --- 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 ############################################## OUTSUB=$(TARGETMODE)-$(TARGETTYPE)

1 0

pd/portaudio_v18/pa_mac pa_mac.c,1.6.2.2,1.6.2.3
by Miller Puckette 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20598/pd/portaudio_v18/pa_mac Modified Files: Tag: stable_0_38 pa_mac.c Log Message: 0.38-0 release.

1 0

pd/portaudio_v18/pa_common pa_host.h,1.6.2.2,1.6.2.3 pa_lib.c,1.6.2.2,1.6.2.3 pa_trace.c,1.6.2.2,1.6.2.3 pa_trace.h,1.6.2.2,1.6.2.3 portaudio.h,1.6.2.2,1.6.2.3
by Miller Puckette 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20598/pd/portaudio_v18/pa_common Modified Files: Tag: stable_0_38 pa_host.h pa_lib.c pa_trace.c pa_trace.h portaudio.h Log Message: 0.38-0 release.

1 0

pd/portaudio_v18/pa_sgi pa_sgi.c,1.6.2.2,1.6.2.3
by Miller Puckette 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_sgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20598/pd/portaudio_v18/pa_sgi Modified Files: Tag: stable_0_38 pa_sgi.c Log Message: 0.38-0 release.

1 0

pd/portaudio_v18/pa_mac_core pa_mac_core.c,1.6.2.2,1.6.2.3
by Miller Puckette 03 Jan '05

03 Jan '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_mac_core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20598/pd/portaudio_v18/pa_mac_core Modified Files: Tag: stable_0_38 pa_mac_core.c Log Message: 0.38-0 release.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs January 2005