""

svn path=/trunk/; revision=2026

7 files changed, 101 insertions, 20 deletions

diff --git a/externals/grill/dyn/dyn.vcproj b/externals/grill/dyn/dyn.vcproj
index 906f9163..78c3061a 100644
--- a/externals/grill/dyn/dyn.vcproj
+++ b/externals/grill/dyn/dyn.vcproj
@@ -145,6 +145,73 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="PD Shared Release|Win32"
+			OutputDirectory="./pd-msvc/sr"
+			IntermediateDirectory="./pd-msvc/sr"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="3"
+				AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src,f:\prog\max\flext\source;f:\prog\packs\pthreads"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				EnableEnhancedInstructionSet="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="$(outdir)/dyn.pch"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pd.lib pthreadVC.lib"
+				OutputFile="$(outdir)/dyn~.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="f:\prog\pd\pd-cvs/bin,..\flext\pd-msvc,f:\prog\packs\pthreads"
+				ProgramDatabaseFile="$(outdir)/dyn~.pdb"
+				ImportLibrary="$(outdir)/dyn~.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\pd-msvc/r/dyn.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -179,6 +246,13 @@
 					AdditionalIncludeDirectories=""
 					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PD;$(NoInherit)"/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="PD Shared Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""/>
+			</FileConfiguration>
 		</File>
 	</Files>
 	<Globals>
diff --git a/externals/grill/dyn/src/main.cpp b/externals/grill/dyn/src/main.cpp
index 34b2f7bf..a9aee6b7 100644
--- a/externals/grill/dyn/src/main.cpp
+++ b/externals/grill/dyn/src/main.cpp
@@ -196,7 +196,7 @@ const t_symbol *dyn::sym_dsp = NULL;
 void dyn::setup(t_classid c)
 {
 	post("");
-	post("dyn~ %s - dynamic object management, (C)2003-2004 Thomas Grill",DYN_VERSION);
+	post("dyn~ %s - dynamic object management, (C)2003-04 Thomas Grill",DYN_VERSION);
 	post("");
 
     sym_dynsin = MakeSymbol("dyn_in~");
diff --git a/externals/grill/fftease/fftease.vcproj b/externals/grill/fftease/fftease.vcproj
index 18abd1d6..d609b263 100644
--- a/externals/grill/fftease/fftease.vcproj
+++ b/externals/grill/fftease/fftease.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="fftease"
+	ProjectGUID="{F0C94DB3-3747-478E-86A1-0AE613156D93}"
 	SccProjectName="max/fftease"
 	SccAuxPath=""
 	SccLocalPath="."
diff --git a/externals/grill/pool/pool.vcproj b/externals/grill/pool/pool.vcproj
index 1b8a819a..f986de2d 100644
--- a/externals/grill/pool/pool.vcproj
+++ b/externals/grill/pool/pool.vcproj
@@ -291,8 +291,11 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="3"
 				AdditionalIncludeDirectories="&quot;f:\prog\pd\pd-cvs\src&quot;;f:\prog\packs\pthreads;f:\prog\max\flext\source"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED"
 				StringPooling="TRUE"
@@ -300,9 +303,6 @@
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\pd-msvc/r/pool.pch"
-				AssemblerListingLocation=".\pd-msvc/r/"
-				ObjectFile=".\pd-msvc/r/"
-				ProgramDataBaseFileName=".\pd-msvc/r/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="0"
diff --git a/externals/grill/py/py.vcproj b/externals/grill/py/py.vcproj
index a6e974c0..a8c1eaf2 100644
--- a/externals/grill/py/py.vcproj
+++ b/externals/grill/py/py.vcproj
@@ -292,14 +292,14 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="flext_ld.lib pd.lib pthreadVC.lib"
+				AdditionalDependencies="pd.lib pthreadVC.lib"
 				OutputFile="$(outdir)/py.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="f:\prog\max\flext\pd-msvc;&quot;f:\prog\pd\pd-cvs/bin&quot;;f:\prog\packs\pthreads;&quot;f:\prog\packs\Python-2.3.4\PCbuild&quot;"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\pd-msvc\td/py.pdb"
-				ImportLibrary=".\pd-msvc\sd/py.lib"
+				ProgramDatabaseFile="$(outdir)/py.pdb"
+				ImportLibrary="$(outdir)/py.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -340,8 +340,11 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="3"
 				AdditionalIncludeDirectories="&quot;f:\prog\pd\pd-cvs\src&quot;;f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED"
 				StringPooling="TRUE"
@@ -362,7 +365,7 @@
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="f:\prog\max\flext\pd-msvc;&quot;f:\prog\pd\pd-cvs/bin&quot;;f:\prog\packs\pthreads;C:\Programme\prog\Python23\libs"
 				ProgramDatabaseFile=".\pd-msvc\tr/py.pdb"
-				ImportLibrary=".\pd-msvc\sr/py.lib"
+				ImportLibrary="$(outdir)/py.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
diff --git a/externals/grill/vasp/vasp.vcproj b/externals/grill/vasp/vasp.vcproj
index f806d965..1f7fa81a 100644
--- a/externals/grill/vasp/vasp.vcproj
+++ b/externals/grill/vasp/vasp.vcproj
@@ -287,7 +287,9 @@
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
-				OptimizeForProcessor="2"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="3"
+				OptimizeForWindowsApplication="FALSE"
 				AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src;f:\prog\packs\pthreads,f:\prog\max\flext\source"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED"
 				ExceptionHandling="TRUE"
@@ -296,6 +298,7 @@
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="main.h"
+				PrecompiledHeaderFile="$(outdir)/$(TargetName).pch"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="3"
@@ -305,13 +308,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="pthreadVC.lib pd.lib"
-				OutputFile=".\pd-msvc\sr/vasp.dll"
+				OutputFile="$(outdir)/vasp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="f:\prog\pd\pd-cvs\bin;f:\prog\packs\pthreads"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\pd-msvc\t/vasp.pdb"
-				ImportLibrary=".\pd-msvc\t/vasp.lib"
+				GenerateDebugInformation="FALSE"
+				ProgramDatabaseFile="$(outdir)/vasp.pdb"
+				ImportLibrary="$(outdir)/vasp.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
diff --git a/externals/grill/vst/vst.vcproj b/externals/grill/vst/vst.vcproj
index 4872991c..bb13fe1a 100644
--- a/externals/grill/vst/vst.vcproj
+++ b/externals/grill/vst/vst.vcproj
@@ -145,8 +145,8 @@
 		</Configuration>
 		<Configuration
 			Name="PD Shared Release|Win32"
-			OutputDirectory=".\pd-msvc/s"
-			IntermediateDirectory=".\pd-msvc/s"
+			OutputDirectory=".\pd-msvc/sr"
+			IntermediateDirectory=".\pd-msvc/sr"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -177,7 +177,7 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="f:\prog\pd\pd-cvs\bin,f:\prog\packs\pthreads"
-				ProgramDatabaseFile=".\pd-msvc/r/vst~.pdb"
+				ProgramDatabaseFile="$(outdir)/vst~.pdb"
 				OptimizeReferences="2"
 				ImportLibrary=".\pd-msvc/r/vst~.lib"
 				TargetMachine="1"/>