10 files changed, 41 insertions, 84 deletions
diff --git a/externals/grill/vasp/build-pd-msvc.bat b/externals/grill/vasp/build-pd-msvc.bat
deleted file mode 100644
index d6187f08..00000000
--- a/externals/grill/vasp/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/vasp/build-win-max-msvc.bat b/externals/grill/vasp/build-win-max-msvc.bat
new file mode 100644
index 00000000..436f6a8e
--- /dev/null
+++ b/externals/grill/vasp/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/vasp/build-win-pd-msvc.bat b/externals/grill/vasp/build-win-pd-msvc.bat
new file mode 100644
index 00000000..942ee174
--- /dev/null
+++ b/externals/grill/vasp/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/vasp/config-pd-msvc.txt b/externals/grill/vasp/config-pd-msvc.txt
deleted file mode 100644
index d4b1d0e2..00000000
--- a/externals/grill/vasp/config-pd-msvc.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# VASP - vector assembling signal processor
-# Copyright (c) 2002-2003 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 run from within the build environment)
-# MSVCPATH=c:\programme\prog\microsoft visual studio\VC98
-
-# where should the external be built?
-OUTPATH=pd-msvc
-
-# should the external be installed? (yes/no)
-INSTALL=yes
-
-# where should the external be installed?
-INSTPATH=$(PDPATH)\extra
diff --git a/externals/grill/vasp/config-win-max-msvc.txt b/externals/grill/vasp/config-win-max-msvc.txt
new file mode 100644
index 00000000..d3ab7178
--- /dev/null
+++ b/externals/grill/vasp/config-win-max-msvc.txt
@@ -0,0 +1,7 @@
+# VASP - vector assembling signal processor
+# 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/vasp/config-win-pd-msvc.txt b/externals/grill/vasp/config-win-pd-msvc.txt
new file mode 100644
index 00000000..83c895a7
--- /dev/null
+++ b/externals/grill/vasp/config-win-pd-msvc.txt
@@ -0,0 +1,7 @@
+# VASP - vector assembling signal processor
+# 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/vasp/makefile-win-msvc.txt b/externals/grill/vasp/makefile-win-msvc.txt
new file mode 100644
index 00000000..17a3bc43
--- /dev/null
+++ b/externals/grill/vasp/makefile-win-msvc.txt
@@ -0,0 +1,10 @@
+# VASP - vector assembling signal processor
+# Copyright (C) 2002 Thomas Grill (xovo@gmx.net)
+#
+# Makefile for MSVC++ 6 and .NET
+#
+# usage:
+# to build run "build-win-max-msvc.bat" or "build-win-pd-msvc.bat"
+#
+
+FLEXT_THREADED=1
diff --git a/externals/grill/vasp/makefile.pd-msvc b/externals/grill/vasp/makefile.pd-msvc
deleted file mode 100644
index f43a2b9d..00000000
--- a/externals/grill/vasp/makefile.pd-msvc
+++ /dev/null
@@ -1,56 +0,0 @@
-# VASP - vector assembling signal processor
-# Copyright (C) 2002 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for MSVC++ 6
-#
-# 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 pthreadVC.lib flext_t-pdwin.lib
-
-# compiler definitions and flags
-DEFS=/DFLEXT_SYS=2 /DFLEXT_THREADS
-
-CFLAGS=/GR /G6 /Ox /MT /EHsc
-
-# the rest can stay untouched
-# ----------------------------------------------
-
-NAME=vasp
-
-!include make-files.txt
-
-
-all: $(OUTPATH) $(OUTPATH)\$(NAME).dll
-
-OBJS= $(SRCS:.cpp=.obj)
-
-# remove build
-clean:
-	-del /s /q $(OUTPATH) > nul
-	rmdir $(OUTPATH)
-
-$(OUTPATH):
-	-mkdir $(OUTPATH)
-
-# bad tricks here... the obj's are phantom files... no real make
-
-{$(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/vasp/source/util.h b/externals/grill/vasp/source/util.h
index 859f37e7..7f7cd080 100644
--- a/externals/grill/vasp/source/util.h
+++ b/externals/grill/vasp/source/util.h
@@ -19,6 +19,13 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 
 #define BIG 1.e10
 
+#ifdef min
+#undef min
+#endif
+
+#ifdef max
+#undef max
+#endif
 
 template<class T>
 inline V swap(T &a,T &b) { T c = a; a = b; b = c; }
diff --git a/externals/grill/vasp/vasp.vcproj b/externals/grill/vasp/vasp.vcproj
index 6bb6807a..94fd8054 100644
--- a/externals/grill/vasp/vasp.vcproj
+++ b/externals/grill/vasp/vasp.vcproj
@@ -286,7 +286,7 @@
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="3"
 				OptimizeForWindowsApplication="FALSE"
-				AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src;f:\prog\packs\pthreads,f:\prog\max\flext\source"
+				AdditionalIncludeDirectories="&quot;c:\data\prog\pd\pd-cvs\src&quot;;c:\data\prog\packs\pthreads;..\flext\source"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
@@ -307,7 +307,7 @@
 				OutputFile="$(outdir)/vasp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="f:\prog\pd\pd-cvs\bin;f:\prog\packs\pthreads"
+				AdditionalLibraryDirectories="&quot;c:\data\prog\pd\pd-cvs\bin&quot;;c:\data\prog\packs\pthreads"
 				GenerateDebugInformation="FALSE"
 				ProgramDatabaseFile="$(outdir)/vasp.pdb"
 				ImportLibrary="$(outdir)/vasp.lib"