From 6031998a44a8f34f67bc6dd6bcc1e37caa53a830 Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Thu, 2 Oct 2003 02:38:04 +0000
Subject:  ""

svn path=/trunk/; revision=1057
---
 externals/grill/py/config-pd-msvc.txt | 10 +++++++---
 externals/grill/py/makefile.pd-msvc   | 20 ++++++++++++++++----
 externals/grill/py/py.vcproj          | 16 +++++++++++++---
 3 files changed, 36 insertions(+), 10 deletions(-)

(limited to 'externals/grill')

diff --git a/externals/grill/py/config-pd-msvc.txt b/externals/grill/py/config-pd-msvc.txt
index 3787eef1..ed8f1101 100644
--- a/externals/grill/py/config-pd-msvc.txt
+++ b/externals/grill/py/config-pd-msvc.txt
@@ -1,5 +1,5 @@
 # py/pyext - python script objects for PD and Max/MSP
-# Copyright (c) 2002 Thomas Grill (xovo@gmx.net)
+# Copyright (c)2002,03 Thomas Grill (xovo@gmx.net)
 #
 
 # where is PD?
@@ -9,10 +9,10 @@ PDPATH=c:\programme\audio\pd
 FLEXTPATH=$(PDPATH)\flext
 
 # where is MS VC++?
-MSVCPATH=c:\programme\prog\microsoft visual studio\VC98
+MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7
 
 # which version of Python?
-PYTHONVER=python22
+PYTHONVER=python23
 
 # where are the python header files?
 PYTHONINCLUDE=c:\programme\prog\$(PYTHONVER)\include
@@ -26,3 +26,7 @@ OUTPATH=pd-msvc
 # where should the external be installed?
 # (leave blank to omit installation)
 INSTDIR=$(PDPATH)\extra
+
+# user defined compiler flags
+# (check if they match your system!)
+UFLAGS=/G6 /Ox
diff --git a/externals/grill/py/makefile.pd-msvc b/externals/grill/py/makefile.pd-msvc
index 46f569a3..d33f0cb7 100644
--- a/externals/grill/py/makefile.pd-msvc
+++ b/externals/grill/py/makefile.pd-msvc
@@ -1,7 +1,7 @@
 # py/pyext - python script object for PD and Max/MSP
-# Copyright (C) 2002 Thomas Grill (xovo@gmx.net)
+# Copyright (C)2002,03 Thomas Grill (xovo@gmx.net)
 #
-# Makefile for MSVC++ 6
+# Makefile for MSVC++ 6 and 7
 #
 # usage:
 # to build run "make -f makefile.pd-msvc"
@@ -12,12 +12,24 @@
 # includes
 INCPATH=/I"$(MSVCPATH)\include" /I"$(PYTHONINCLUDE)" /I"$(PDPATH)\src" /I"$(FLEXTPATH)"
 LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPATH)"
-LIBS=pd.lib pthreadVC.lib flext_t-pdwin.lib $(PYTHONLIB)
 
 # compiler definitions and flags
 DEFS=/DFLEXT_SYS=2 /DFLEXT_THREADS
+CFLAGS=/MT $(UFLAGS)
+
+# for VC7
+CFLAGS=$(CFLAGS) /EHsc 
+
+
+LIBS=pd.lib pthreadVC.lib $(PYTHONLIB)
+
+!ifdef FLEXT_SHARED
+LIBS=$(LIBS) flext_t-pdwin.lib
+DEFS=$(DEFS) /DFLEXT_SHARED
+!else
+LIBS=$(LIBS) flext_t-pdwin.lib
+!endif
 
-CFLAGS=/GR- /GX- /GD /G6 /Ox /MT
 
 # the rest can stay untouched
 # ----------------------------------------------
diff --git a/externals/grill/py/py.vcproj b/externals/grill/py/py.vcproj
index 968b1407..2f841fc6 100644
--- a/externals/grill/py/py.vcproj
+++ b/externals/grill/py/py.vcproj
@@ -23,7 +23,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source,C:\Programme\prog\Python22\include"
+				AdditionalIncludeDirectories="c:\programme\audio\pd\src;f:\prog\max\flext\source;C:\Programme\prog\Python23\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -215,7 +215,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source,C:\Programme\prog\Python22\include"
+				AdditionalIncludeDirectories="c:\programme\audio\pd\src;f:\prog\max\flext\source;C:\Programme\prog\Python23\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -232,7 +232,7 @@
 				OutputFile=".\pd-msvc\r/py.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="c:/programme/audio/pd/bin,..\flext\pd-msvc,C:\Programme\prog\Python22\libs"
+				AdditionalLibraryDirectories="c:/programme/audio/pd/bin;&quot;..\flext\pd-msvc&quot;;C:\Programme\prog\Python23\libs"
 				ProgramDatabaseFile=".\pd-msvc\r/py.pdb"
 				ImportLibrary=".\pd-msvc\r/py.lib"
 				TargetMachine="1"/>
@@ -428,6 +428,16 @@
 				RelativePath="readme.txt">
 			</File>
 		</Filter>
+		<Filter
+			Name="make"
+			Filter="">
+			<File
+				RelativePath=".\config-pd-msvc.txt">
+			</File>
+			<File
+				RelativePath=".\makefile.pd-msvc">
+			</File>
+		</Filter>
 		<File
 			RelativePath="source\bound.cpp">
 			<FileConfiguration
-- 
cgit v1.2.1