Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1:/tmp/cvs-serv10272

Modified Files: config-pd-msvc.txt make-inc.pd-msvc makefile.pd-msvc readme.txt Added Files: build-max-msvc.bat config-max-msvc.txt make-inc.max-msvc makefile.max-msvc Removed Files: flext.dsp flext_sh.dsp Log Message: ""

--- NEW FILE: build-max-msvc.bat --- @echo --- Building flext with MS Visual C++ ---

nmake -f makefile.max-msvc clean nmake -f makefile.max-msvc

--- NEW FILE: config-max-msvc.txt --- # flext - C++ layer for Max/MSP and pd (pure data) externals # Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) #

# where is the Max SDK? MAXSDKPATH=F:\prog\audio\MaxWinSDK\c74support

# where is the pthreads package? PTHREADS=F:\prog\packs\pthreads

# where is MS VC++? # (should be commented out when called from the Visual Studio Command prompt) # MSVCPATH="c:\programme\prog\microsoft visual studio\VC98"

# where is the SndObj include directory? # headers are searched in SNDOBJ/include, the sndobj.lib in SNDOBJ/lib # (leave blank or comment out to disable SndObj support) # SNDOBJ=f:\prog\audio\sndobj

# where is the STK include directory? # headers are searched in STK/include, the stk.lib in STK/lib # (leave blank or comment out to disable STK support) # STK=f:\prog\audio\stk

# where should flext libraries be built? # object files will be placed in subfolders OUTPATH=".\max-msvc"

# where should flext libraries be installed? # (leave blank to omit installation) INSTDIR=$(PDPATH)\flext

# user-definable compiler flags # e.g. FLEXT_USE_SIMD enables SIMD support for capable CPUs (for VC++ 6, you need the Processor Pack) UFLAGS=/DFLEXT_USE_SIMD /G6 /arch:SSE

--- NEW FILE: make-inc.max-msvc --- # flext - C++ layer for Max/MSP and pd (pure data) externals # Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) # # ----- for internal use ---------------------- #

!include config-max-msvc.txt

# source files SOURCE=source

# includes INCPATH=/I$(MSVCPATH)\include /I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes /I$(PTHREADS) /I$(SOURCE) LDFLAGS=/LIBPATH:$(MSVCPATH)\lib

# compiler definitions and flags DEFS=/DFLEXT_SYS=1 $(UFLAGS)

CFLAGS=/GX /GD OFLAGS=/Ox DFLAGS=/Od /Zi

TARGET=maxwin # appendix to lib name

!ifdef FLEXT_SHARED DEFS=$(DEFS) /DFLEXT_SHARED /DFLEXT_EXPORTS

LIBS=$(LIBS) $(PTHREADS)\pthreadVC.lib

!ifdef _DEBUG LIBS=$(LIBS) $(MAXSDKPATH)\max-includes\win-includes\debug\maxapi.lib $(MAXSDKPATH)\msp-includes\win-includes\debug\maxaudio.lib !else LIBS=$(LIBS) $(MAXSDKPATH)\max-includes\win-includes\release\maxapi.lib $(MAXSDKPATH)\msp-includes\win-includes\release\maxaudio.lib !endif

EXT=dll

!ifndef _DEBUG CFLAGS=$(CFLAGS) $(OFLAGS) /MT /LD OBJPATH=l !else CFLAGS=$(CFLAGS) $(DFLAGS) /MTd /LDd OBJPATH=ld !endif

!else

EXT=lib

!ifdef FLEXT_THREADS DEFS=$(DEFS) /DFLEXT_THREADS

!ifndef _DEBUG CFLAGS=$(CFLAGS) $(OFLAGS) /MT OBJPATH=t !else CFLAGS=$(CFLAGS) $(DFLAGS) /MTd OBJPATH=td !endif

!else

!ifndef _DEBUG CFLAGS=$(CFLAGS) $(OFLAGS) /ML OBJPATH=s !else CFLAGS=$(CFLAGS) $(DFLAGS) /MLd OBJPATH=sd !endif

!endif # FLEXT_THREADS

!endif # FLEXT_SHARED

# 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) INCPATH=$(INCPATH) /I$(SNDOBJ)/include !endif

!ifdef STK SRCS=$(SRCS) $(SRCS_STK) HDRS=$(HDRS) $(HDRS_STK) INCPATH=$(INCPATH) /I$(STK)/include !endif

#default target all: $(OUTPATH)$(NAME)-$(TARGET).$(EXT)

# remove build clean: -cd $(OUTPATH) -del /s /q $(OBJPATH) > nul -rmdir $(OBJPATH) -cd .. -del /q $(OUTPATH)$(NAME)-$(TARGET).$(EXT) > nul -rmdir $(OUTPATH)

# -----------------------------------------------

OBJS= $(SRCS:.cpp=.obj)

{$(SOURCE)}.cpp.obj: @-if not exist $(OUTPATH) mkdir $(OUTPATH) @cd $(OUTPATH) @-if not exist $(OBJPATH) mkdir $(OBJPATH) @cd .. cl /c $(CFLAGS) $(DEFS) $(INCPATH) /Fo$(OUTPATH)$(OBJPATH)$@ $<

$(OUTPATH)$(NAME)-$(TARGET).lib: $(OBJS) @cd $(OUTPATH)$(OBJPATH) lib /OUT:..$(NAME)-$(TARGET).lib $(OBJS) @cd .... !ifdef INSTDIR @-if not exist $(OBJPATH) mkdir $(INSTDIR) copy $(OUTPATH)$(NAME)-$(TARGET).lib $(INSTDIR) > nul copy $(SOURCE)*.h $(INSTDIR) > nul !endif

$(OUTPATH)$(NAME)-$(TARGET).dll: $(OBJS) @cd $(OUTPATH)$(OBJPATH) link /DLL /NOLOGO $(LDFLAGS) /OUT:..$(NAME)-$(TARGET).dll $(LIBS) $(OBJS) @cd .... !ifdef INSTDIR @-if not exist $(OBJPATH) mkdir $(INSTDIR) copy $(OUTPATH)$(NAME)-$(TARGET).dll $(INSTDIR) > nul copy $(SOURCE)*.h $(INSTDIR) > nul !endif

--- NEW FILE: makefile.max-msvc --- # flext - C++ layer for Max/MSP and pd (pure data) externals # Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) # # Makefile for MSVC++ # # # IMPORTANT: Adjust some of the paths also in makefile-inc.msvc # # usage: make -f makefile.max-msvc # # ---------------------------------------------------------------

!include config-max-msvc.txt

all: flext flext_t flext_d flext_td # flext_s flext_sd

flext: nmake /f make-inc.max-msvc NAME=$*

flext_d: nmake /f make-inc.max-msvc NAME=$* _DEBUG=1

flext_t: nmake /f make-inc.max-msvc NAME=$* FLEXT_THREADS=1

flext_td: nmake /f make-inc.max-msvc NAME=$* FLEXT_THREADS=1 _DEBUG=1

flext_s: nmake /f make-inc.max-msvc NAME=flext FLEXT_SHARED=1

flext_sd: nmake /f make-inc.max-msvc NAME=flext_d FLEXT_SHARED=1 _DEBUG=1

clean: nmake /f make-inc.max-msvc clean

Index: config-pd-msvc.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/config-pd-msvc.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config-pd-msvc.txt 19 Jul 2003 02:32:51 -0000 1.7 --- config-pd-msvc.txt 12 Nov 2003 03:35:18 -0000 1.8 *************** *** 6,20 **** PDPATH=c:\programme\audio\pd

# where is MS VC++? # (should be commented out when called from the Visual Studio Command prompt) # MSVCPATH="c:\programme\prog\microsoft visual studio\VC98"

! # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) ! SNDOBJ=f:\prog\audio\sndobj\include

# where is the STK include directory? # (leave blank or comment out to disable STK support) ! STK=f:\prog\audio\stk\include

# where should flext libraries be built? --- 6,26 ---- PDPATH=c:\programme\audio\pd

+ # where is the pthreads package? + # (comment out if you use the standard pd package where pthreads are included) + # PTHREADS=F:\prog\packs\pthreads + # where is MS VC++? # (should be commented out when called from the Visual Studio Command prompt) # MSVCPATH="c:\programme\prog\microsoft visual studio\VC98"

! # where is the SndObj directory? ! # headers are searched in SNDOBJ/include, the sndobj.lib in SNDOBJ/lib # (leave blank or comment out to disable SndObj support) ! SNDOBJ=f:\prog\audio\sndobj

# where is the STK include directory? + # headers are searched in STK/include, the stk.lib in STK/lib # (leave blank or comment out to disable STK support) ! STK=f:\prog\audio\stk

# where should flext libraries be built? *************** *** 27,30 ****

# user-definable compiler flags ! # e.g. FLEXT_USE_SIMD enables SIMD support for capable CPUs (you need the Processor Pack for MSVC++) ! UFLAGS=-DFLEXT_USE_SIMD --- 33,36 ----

# user-definable compiler flags ! # e.g. FLEXT_USE_SIMD enables SIMD support for capable CPUs (for MSVC6, you need the Processor Pack) ! UFLAGS=/DFLEXT_USE_SIMD /G6 /arch:SSE

Index: make-inc.pd-msvc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/make-inc.pd-msvc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** make-inc.pd-msvc 19 Jul 2003 02:32:52 -0000 1.9 --- make-inc.pd-msvc 12 Nov 2003 03:35:18 -0000 1.10 *************** *** 11,29 ****

# includes ! INCPATH=/I$(MSVCPATH)\include /I$(PDPATH)\src /I$(SOURCE) ! LDFLAGS=/LIBPATH:$(MSVCPATH)\lib

! !ifdef SNDOBJ ! INCPATH=$(INCPATH) /I$(SNDOBJ) !endif

! !ifdef STK ! INCPATH=$(INCPATH) /I$(STK) !endif

# compiler definitions and flags DEFS=/DFLEXT_SYS=2 $(UFLAGS)

! CFLAGS=/GX /GD /G6 /arch:SSE OFLAGS=/Ox DFLAGS=/Od /Zi --- 11,31 ----

# includes ! INCPATH=/I$(PDPATH)\src /I$(SOURCE)

! !ifdef MSVCPATH ! INCPATH=$(INCPATH) /I$(MSVCPATH)\include !endif

! !ifdef PTHREADS ! INCPATH=$(INCPATH) /I$(PTHREADS) !endif

+ LDFLAGS=/LIBPATH:$(MSVCPATH)\lib + + # compiler definitions and flags DEFS=/DFLEXT_SYS=2 $(UFLAGS)

! CFLAGS=/GX /GD OFLAGS=/Ox DFLAGS=/Od /Zi *************** *** 34,38 ****

!ifdef FLEXT_SHARED ! DEFS=$(DEFS) /DFLEXT_SHARED /DFLEXT_DLL

EXT=dll --- 36,40 ----

!ifdef FLEXT_SHARED ! DEFS=$(DEFS) /DFLEXT_SHARED /DFLEXT_EXPORTS

EXT=dll *************** *** 46,49 **** --- 48,59 ---- !endif

+ LIBS=$(PDPATH)\bin\pd.lib + + !ifdef PTHREADS + LIBS=$(LIBS) $(PTHREADS)\pthreadVC.lib + !else + LIBS=$(LIBS) $(PDPATH)\bin\pthreadVC.lib + !endif + !else

*************** *** 85,88 **** --- 95,100 ---- SRCS=$(SRCS) $(SRCS_SNDOBJ) HDRS=$(HDRS) $(HDRS_SNDOBJ) + INCPATH=$(INCPATH) /I$(SNDOBJ)\include + LIBS=$(LIBS) $(SNDOBJ)\lib\sndobj.lib !endif

*************** *** 90,93 **** --- 102,107 ---- SRCS=$(SRCS) $(SRCS_STK) HDRS=$(HDRS) $(HDRS_STK) + INCPATH=$(INCPATH) /I$(STK)\include + LIBS=$(LIBS) $(STK)\lib\stk.lib !endif

*************** *** 113,118 **** @-if not exist $(OBJPATH) mkdir $(OBJPATH) @cd .. ! cl /c $(CFLAGS) $(DEFS) $(INCPATH) /Fo$(OUTPATH)$(OBJPATH)$@ $< !

--- 127,131 ---- @-if not exist $(OBJPATH) mkdir $(OBJPATH) @cd .. ! cl /c $(CFLAGS) $(DEFS) $(INCPATH) /Fo$(OUTPATH)$(OBJPATH)$(@F) $<

*************** *** 130,134 **** $(OUTPATH)$(NAME)-$(TARGET).dll: $(OBJS) @cd $(OUTPATH)$(OBJPATH) ! link /DLL /NOLOGO $(LDFLAGS) /OUT:..$(NAME)-$(TARGET).dll $(PDPATH)\bin\pd.lib $(OBJS) @cd .... !ifdef INSTDIR --- 143,147 ---- $(OUTPATH)$(NAME)-$(TARGET).dll: $(OBJS) @cd $(OUTPATH)$(OBJPATH) ! link /DLL /NOLOGO $(LDFLAGS) /OUT:..$(NAME)-$(TARGET).dll $(LIBS) $(OBJS) @cd .... !ifdef INSTDIR

Index: makefile.pd-msvc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-msvc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.pd-msvc 23 May 2003 18:34:11 -0000 1.3 --- makefile.pd-msvc 12 Nov 2003 03:35:18 -0000 1.4 *************** *** 13,17 **** !include config-pd-msvc.txt

! all: flext flext_t flext_d flext_td # flext_l flext_ld

flext: --- 13,17 ---- !include config-pd-msvc.txt

! all: flext flext_t flext_d flext_td # flext_s flext_sd

flext: *************** *** 27,35 **** nmake /f make-inc.pd-msvc NAME=$* FLEXT_THREADS=1 _DEBUG=1

! flext_l: ! nmake /f make-inc.pd-msvc NAME=flext FLEXT_THREADS=1 FLEXT_SHARED=1

! flext_ld: ! nmake /f make-inc.pd-msvc NAME=flext_d FLEXT_THREADS=1 FLEXT_SHARED=1 _DEBUG=1

--- 27,35 ---- nmake /f make-inc.pd-msvc NAME=$* FLEXT_THREADS=1 _DEBUG=1

! flext_s: ! nmake /f make-inc.pd-msvc NAME=flext FLEXT_SHARED=1

! flext_sd: ! nmake /f make-inc.pd-msvc NAME=flext_d FLEXT_SHARED=1 _DEBUG=1

Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/readme.txt,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** readme.txt 8 Nov 2003 03:35:34 -0000 1.42 --- readme.txt 12 Nov 2003 03:35:18 -0000 1.43 *************** *** 38,42 **** pd - Windows: ------------- ! o Microsoft Visual C++ 6: edit "config-pd-msvc.txt" & run "build-pd-msvc.bat"

o Borland C++ 5.5 (free): edit "config-pd-bcc.txt" & run "build-pd-bcc.bat" --- 38,42 ---- pd - Windows: ------------- ! o Microsoft Visual C++ 6 or 7: edit "config-pd-msvc.txt" & run "build-pd-msvc.bat"

o Borland C++ 5.5 (free): edit "config-pd-bcc.txt" & run "build-pd-bcc.bat" *************** *** 65,68 **** --- 65,75 ----

With your project using flext, be sure to define "FLEXT_SYS=2". + + + Max/MSP - Windows: + ------------------ + o Microsoft Visual C++ 6 or 7: edit "config-max-msvc.txt" & run "build-max-msvc.bat" + + With your project using flext, be sure to define "FLEXT_SYS=1".

--- flext.dsp DELETED ---

--- flext_sh.dsp DELETED ---