From f38b827252320ae0fdacce3d418058cca3b84bce Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Fri, 17 Dec 2004 05:03:46 +0000 Subject: fixes for Max/MSP enhanced and optimized atom parsing using flext build system additions for Max/MSP build svn path=/trunk/; revision=2397 --- externals/grill/pool/build-max-msvc.bat | 4 -- externals/grill/pool/build-pd-msvc.bat | 4 -- externals/grill/pool/build-win-max-msvc.bat | 4 ++ externals/grill/pool/build-win-pd-msvc.bat | 4 ++ externals/grill/pool/config-max-msvc.txt | 28 ---------- externals/grill/pool/config-pd-msvc.txt | 24 --------- externals/grill/pool/config-win-max-msvc.txt | 7 +++ externals/grill/pool/config-win-pd-msvc.txt | 7 +++ externals/grill/pool/makefile-win-msvc.txt | 8 +++ externals/grill/pool/makefile.max-msvc | 76 ---------------------------- externals/grill/pool/makefile.pd-msvc | 52 ------------------- externals/grill/pool/pool.vcproj | 4 +- 12 files changed, 32 insertions(+), 190 deletions(-) delete mode 100644 externals/grill/pool/build-max-msvc.bat delete mode 100644 externals/grill/pool/build-pd-msvc.bat create mode 100644 externals/grill/pool/build-win-max-msvc.bat create mode 100644 externals/grill/pool/build-win-pd-msvc.bat delete mode 100644 externals/grill/pool/config-max-msvc.txt delete mode 100644 externals/grill/pool/config-pd-msvc.txt create mode 100644 externals/grill/pool/config-win-max-msvc.txt create mode 100644 externals/grill/pool/config-win-pd-msvc.txt create mode 100644 externals/grill/pool/makefile-win-msvc.txt delete mode 100644 externals/grill/pool/makefile.max-msvc delete mode 100644 externals/grill/pool/makefile.pd-msvc (limited to 'externals/grill/pool') diff --git a/externals/grill/pool/build-max-msvc.bat b/externals/grill/pool/build-max-msvc.bat deleted file mode 100644 index 130a3bc0..00000000 --- a/externals/grill/pool/build-max-msvc.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo --- Building with MS Visual C++ --- - -nmake -f makefile.max-msvc clean -nmake -f makefile.max-msvc diff --git a/externals/grill/pool/build-pd-msvc.bat b/externals/grill/pool/build-pd-msvc.bat deleted file mode 100644 index d6187f08..00000000 --- a/externals/grill/pool/build-pd-msvc.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo --- Building with MS Visual C++ --- - -nmake -f makefile.pd-msvc clean -nmake -f makefile.pd-msvc diff --git a/externals/grill/pool/build-win-max-msvc.bat b/externals/grill/pool/build-win-max-msvc.bat new file mode 100644 index 00000000..d99ba534 --- /dev/null +++ b/externals/grill/pool/build-win-max-msvc.bat @@ -0,0 +1,4 @@ +@echo --- Building with MS Visual C++ --- + +nmake -f ..\flext\build\make-win-max-msvc.txt clean +nmake -f ..\flext\build\make-win-max-msvc.txt diff --git a/externals/grill/pool/build-win-pd-msvc.bat b/externals/grill/pool/build-win-pd-msvc.bat new file mode 100644 index 00000000..942ee174 --- /dev/null +++ b/externals/grill/pool/build-win-pd-msvc.bat @@ -0,0 +1,4 @@ +@echo --- Building with MS Visual C++ --- + +nmake -f ..\flext\build\make-win-pd-msvc.txt clean +nmake -f ..\flext\build\make-win-pd-msvc.txt diff --git a/externals/grill/pool/config-max-msvc.txt b/externals/grill/pool/config-max-msvc.txt deleted file mode 100644 index bff5c60f..00000000 --- a/externals/grill/pool/config-max-msvc.txt +++ /dev/null @@ -1,28 +0,0 @@ -# pool - hierarchical storage object for PD and Max/MSP -# Copyright (c) 2002-2004 Thomas Grill (xovo@gmx.net) -# - -# where is the Max SDK? -# you should have the latest version! -MAXSDKPATH="F:\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 /arch:SSE diff --git a/externals/grill/pool/config-pd-msvc.txt b/externals/grill/pool/config-pd-msvc.txt deleted file mode 100644 index 6b198398..00000000 --- a/externals/grill/pool/config-pd-msvc.txt +++ /dev/null @@ -1,24 +0,0 @@ -# pool - hierarchical storage object for PD and Max/MSP -# Copyright (c) 2002-2004 Thomas Grill (xovo@gmx.net) -# - -# where is PD? -PDPATH=c:\programme\audio\pd - -# where do the flext libraries reside? -FLEXTPATH=$(PDPATH)\flext - -# where is MS VC++? -# (only necessary if not started with build environment) -# MSVCPATH=c:\programme\prog\microsoft visual studio\VC98 - -# where should the external be built? -OUTPATH=pd-msvc - -# where should the external be installed? -# (leave blank to omit installation) -INSTPATH=$(PDPATH)\extra - - -# additional compiler flags -UFLAGS=/G6 /Ox \ No newline at end of file diff --git a/externals/grill/pool/config-win-max-msvc.txt b/externals/grill/pool/config-win-max-msvc.txt new file mode 100644 index 00000000..a59d7704 --- /dev/null +++ b/externals/grill/pool/config-win-max-msvc.txt @@ -0,0 +1,7 @@ +# pool - hierarchical storage object for PD and Max/MSP +# Copyright (c) 2002-2004 Thomas Grill (gr@grrrr.org) +# +# Your settings are defined in the file +# ..\flext\build\config-win-max-msvc.txt +# +# You can override them here. diff --git a/externals/grill/pool/config-win-pd-msvc.txt b/externals/grill/pool/config-win-pd-msvc.txt new file mode 100644 index 00000000..4f041743 --- /dev/null +++ b/externals/grill/pool/config-win-pd-msvc.txt @@ -0,0 +1,7 @@ +# pool - hierarchical storage object for PD and Max/MSP +# Copyright (c) 2002-2004 Thomas Grill (gr@grrrr.org) +# +# Your settings are defined in the file +# ..\flext\build\config-win-pd-msvc.txt +# +# You can override them here. diff --git a/externals/grill/pool/makefile-win-msvc.txt b/externals/grill/pool/makefile-win-msvc.txt new file mode 100644 index 00000000..d4398a9c --- /dev/null +++ b/externals/grill/pool/makefile-win-msvc.txt @@ -0,0 +1,8 @@ +# xsample - extended sample objects for Max/MSP and pd (pure data) +# Copyright (c) 2001-2004 Thomas Grill (gr@grrrr.org) +# +# Makefile for MSVC++ 6 and .NET +# +# usage: +# to build run "build-win-max-msvc.bat" or "build-win-pd-msvc.bat" +# diff --git a/externals/grill/pool/makefile.max-msvc b/externals/grill/pool/makefile.max-msvc deleted file mode 100644 index 1bd26c6d..00000000 --- a/externals/grill/pool/makefile.max-msvc +++ /dev/null @@ -1,76 +0,0 @@ -# pool - hierarchical storage object for PD and Max/MSP -# Copyright (c) 2002-2004 Thomas Grill (xovo@gmx.net) -# -# Makefile for MSVC++ 6 and .NET -# -# usage: -# to build run "make -f makefile.max-msvc" -# - -!include config-max-msvc.txt - -# includes -INCPATH=/I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes /I$(FLEXTPATH) -LDFLAGS=/LIBPATH:$(FLEXTPATH) - -!ifdef MSVCPATH -INCPATH=$(INCPATH) /I$(MSVCPATH)\include -LDFLAGS=$(LDFLAGS) /LIBPATH:$(MSVCPATH)\lib -!endif - -!ifdef _DEBUG -LIBS=flext_d-maxwin.lib -!else -LIBS=flext-maxwin.lib -!endif - -LDFLAGS=$(LDFLAGS) /LIBPATH:$(MAXSDKPATH)\max-includes /LIBPATH:$(MAXSDKPATH)\msp-includes - -LIBS=$(LIBS) maxapi.lib maxaudio.lib - -# compiler definitions and flags -DEFS=/DFLEXT_SYS=1 $(UFLAGS) - -CFLAGS=/ML /GR- /GD /Ox /GX /Zp2 - -# the rest can stay untouched -# ---------------------------------------------- - -# all the source files from the package -!include make-files.txt - -# ----------------------------------------------- - -EXT=mxe - -all: $(OUTPATH) $(OUTPATH)\$(NAME).$(EXT) - -# remove build -clean: - -del /q $(OUTPATH) > nul - -rmdir $(OUTPATH) > nul - -OBJS= $(SRCS:.c=.obj) -OBJS= $(OBJS:.objpp=.obj) - - -$(OUTPATH): - -mkdir $(OUTPATH) > nul - -{$(SRCDIR)}.cpp{}.obj: - cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@ - -{$(SRCDIR)}.c{}.obj: - cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@ - - -$(OUTPATH)\$(NAME).$(EXT): $(OBJS) - cd $(OUTPATH) - link /DLL $(LDFLAGS) /out:$(NAME).$(EXT) /INCREMENTAL:NO $** $(LIBS) $(LIBPATH) - @-del *.exp - @-del *.lib - cd .. -!ifdef INSTPATH - @-if not exist $(INSTPATH) mkdir $(INSTPATH) - copy $@ $(INSTPATH) > nul -!endif diff --git a/externals/grill/pool/makefile.pd-msvc b/externals/grill/pool/makefile.pd-msvc deleted file mode 100644 index 7430d506..00000000 --- a/externals/grill/pool/makefile.pd-msvc +++ /dev/null @@ -1,52 +0,0 @@ -# pool - hierarchical storage object for PD and Max/MSP -# Copyright (C) 2002-2004 Thomas Grill (xovo@gmx.net) -# -# Makefile for MSVC++ 6 and 7 -# -# usage: -# to build run "make -f makefile.pd-msvc" -# - -!include config-pd-msvc.txt - -# includes -INCPATH=/I"$(MSVCPATH)\include" /I"$(PDPATH)\src" /I"$(FLEXTPATH)" -LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPATH)" -LIBS=pd.lib flext-pdwin.lib - -# compiler definitions and flags -DEFS=/DFLEXT_SYS=2 - -CFLAGS=/ML /EHsc $(UFLAGS) - - -# the rest can stay untouched -#################################### - -!include make-files.txt - -all: $(OUTPATH) $(OUTPATH)\$(NAME).dll - -# remove build -clean: - -del /q $(OUTPATH) > nul - -rmdir $(OUTPATH) > nul - -OBJS= $(SRCS:.cpp=.obj) - -$(OUTPATH): - -mkdir $(OUTPATH) > nul - -{$(SRCDIR)}.cpp{}.obj: - cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@ - -$(OUTPATH)\$(NAME).dll: $(OBJS) - cd $(OUTPATH) - link /DLL /out:$(NAME).dll /INCREMENTAL:NO $** $(LIBS) $(LIBPATH) - @-del *.exp - @-del *.lib - cd .. -!ifdef INSTPATH - @-if not exist $(INSTPATH) mkdir $(INSTPATH) - copy $@ $(INSTPATH) > nul -!endif diff --git a/externals/grill/pool/pool.vcproj b/externals/grill/pool/pool.vcproj index 4eceac34..1ec3b570 100644 --- a/externals/grill/pool/pool.vcproj +++ b/externals/grill/pool/pool.vcproj @@ -293,7 +293,7 @@ InlineFunctionExpansion="2" OmitFramePointers="TRUE" OptimizeForProcessor="3" - AdditionalIncludeDirectories=""f:\prog\pd\pd-cvs\src";f:\prog\packs\pthreads;f:\prog\max\flext\source" + AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";c:\data\prog\packs\pthreads;..\flext\source" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED" StringPooling="TRUE" RuntimeLibrary="2" @@ -312,7 +312,7 @@ OutputFile="$(outdir)/pool.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=""f:\prog\pd\pd-cvs\bin";f:\prog\packs\pthreads;"f:\prog\max\flext\pd-msvc"" + AdditionalLibraryDirectories=""c:\data\prog\pd\pd-cvs\bin";c:\data\prog\packs\pthreads;"..\flext\pd-msvc"" ProgramDatabaseFile="$(outdir)/pool.pdb" ImportLibrary="$(outdir)/pool.lib" TargetMachine="1"/> -- cgit v1.2.1