Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16508
Modified Files: make-inc.pd-bcc makefile.pd-cygwin makefile.pd-mingw Added Files: build.bat build.sh package.txt Removed Files: buildext.bat buildext.sh Log Message: simplified make system updated make system for BCC updated make system updated build system
Index: make-inc.pd-bcc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/make-inc.pd-bcc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** make-inc.pd-bcc 18 Dec 2004 05:00:55 -0000 1.1 --- make-inc.pd-bcc 20 Dec 2004 05:06:14 -0000 1.2 *************** *** 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 --- 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
Index: makefile.pd-cygwin =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-cygwin,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile.pd-cygwin 23 Feb 2004 03:27:45 -0000 1.12 --- makefile.pd-cygwin 20 Dec 2004 05:06:14 -0000 1.13 *************** *** 53,60 ****
! TARGET=$(TARGDIR)/$(NAME)-pdwin.lib ! TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib ! TARGET_T=$(TARGDIR)/$(NAME)_t-pdwin.lib ! TARGET_TD=$(TARGDIR)/$(NAME)_td-pdwin.lib TARGET_S=$(TARGDIR)/$(NAME).dll TARGET_SD=$(TARGDIR)/$(NAME)_d.dll --- 53,60 ----
! TARGET=$(TARGDIR)/$(NAME)-pdwin.a ! TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.a ! TARGET_T=$(TARGDIR)/$(NAME)_t-pdwin.a ! TARGET_TD=$(TARGDIR)/$(NAME)_td-pdwin.a TARGET_S=$(TARGDIR)/$(NAME).dll TARGET_SD=$(TARGDIR)/$(NAME)_d.dll
--- NEW FILE: build.bat --- @set flext=%~dp0
@rem Arguments: @rem %1 - platform (win/lnx/mac) @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 @set rtsys=%2 @set compiler=%3 @set target=%4
@rem --- The subbatch knowns which make utility to use --- @set subbatch=%flext%buildsys\build-%compiler%.bat
@if "%platform%"=="" goto syntax @if "%rtsys%"=="" goto syntax @if "%compiler%"=="" goto syntax
@if not exist %subbatch% goto syntax
@call %subpatch% %subbatch% %platform% %rtsys% %target% %5 %6 %7 %8 %9
@goto end
@rem ----------------------------------------- :syntax
@echo . @echo SYNTAX: build [platform] [system] [compiler] {target} @echo platform ... win / lnx / mac @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 @echo system path and that all relevant environment variables are properly set.
:end
--- buildext.bat DELETED ---
--- NEW FILE: package.txt --- NAME=flext
FLEXTBUILD=1
BUILDDIR=build SRCDIR=source
SRCS= \ flbase.cpp flext.cpp flbuf.cpp fldsp.cpp fllib.cpp \ flxlet.cpp flattr.cpp flattr_ed.cpp flsupport.cpp \ flutil.cpp flatom.cpp flatom_pr.cpp flthr.cpp fltimer.cpp flsimd.cpp flout.cpp \ flatom_app.cpp flatom_part.cpp flitem.cpp flmeth.cpp flmsg.cpp \ flproxy.cpp flqueue.cpp flbind.cpp HDRS= \ flprefix.h flstdc.h flbase.h flclass.h flext.h flsupport.h flmap.h fldsp.h flinternal.h \ fldefs.h fldefs_hdr.h fldefs_setup.h \ fldefs_methcb.h fldefs_meththr.h fldefs_methadd.h fldefs_methbind.h fldefs_methcall.h \ fldefs_attrcb.h fldefs_attrvar.h fldefs_attradd.h
SRCS_SNDOBJ=flsndobj.cpp HDRS_SNDOBJ=flsndobj.h
SRCS_STK=flstk.cpp
HDRS_STK=flstk.h
--- NEW FILE: build.sh --- flext=${0%/*}/ if [ "$flext" = "$0"/ ]; then flext=./ ; fi
# Arguments: # $1 - platform (win/lnx/mac) # $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 rtsys=$2 compiler=$3 target=$4
# --- The subbatch knowns which make utility to use --- subbatch=${flext}buildsys/build-${compiler}.sh
if [ -n "$platform" -a -n "$rtsys" -a -n "$compiler" -a -f $subbatch ] then sh $subbatch $platform $rtsys $target $5 $6 $7 $8 $9 else echo echo SYNTAX: build.sh [platform] [system] [compiler] {target} echo platform ... win / lnx / mac 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 echo system path and that all relevant environment variables are properly set. fi
Index: makefile.pd-mingw =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-mingw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.pd-mingw 21 Jun 2004 13:58:18 -0000 1.3 --- makefile.pd-mingw 20 Dec 2004 05:06:14 -0000 1.4 *************** *** 91,99 **** $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@
$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@
$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS)) --- 91,99 ---- $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS)) $(AR) rc $@ $^ ! # chmod 644 $@
$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) $(AR) rc $@ $^ ! # chmod 644 $@
$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS)) *************** *** 103,121 **** $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS)) $(AR) rc $@ $^ ! chmod 644 $@
$(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.sro,$(SRCS)) $(CXX) -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS) strip --strip-unneeded $@ ! chmod 755 $@
$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS)) $(CXX) -g -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS) ! chmod 755 $@
.PHONY: clean install clean: ! rm -f $(TARGDIR)/*.o $(TARGETS) ifdef INSTDIR --- 103,121 ---- $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS)) $(AR) rc $@ $^ ! # chmod 644 $@
$(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.sro,$(SRCS)) $(CXX) -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS) strip --strip-unneeded $@ ! # chmod 755 $@
$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS)) $(CXX) -g -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS) ! # chmod 755 $@
.PHONY: clean install clean: ! del -f $(TARGDIR)*.o $(TARGETS) ifdef INSTDIR *************** *** 127,139 ****
install:: $(TARGETS) $(patsubst %,$(SRCDIR)/%,$(HDRS)) ! cp $^ $(INSTDIR) ! ! ! ! ! ! ! ! !
--- 127,130 ----
install:: $(TARGETS) $(patsubst %,$(SRCDIR)/%,$(HDRS)) ! for %%i in ($(subst /,,$^)) do copy %%i $(subst /,,$(INSTDIR)) > nul
--- buildext.sh DELETED ---