""

svn path=/trunk/; revision=823

6 files changed, 199 insertions, 12 deletions

diff --git a/externals/grill/pool/data.cpp b/externals/grill/pool/data.cpp
index c254ad54..d99d83c2 100644
--- a/externals/grill/pool/data.cpp
+++ b/externals/grill/pool/data.cpp
@@ -11,10 +11,11 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #include "pool.h"
 
 #include <string.h>
-#include <fstream.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <fstream>
 
+using namespace std;
 
 pooldata::pooldata(const S *s,I vcnt,I dcnt):
 	sym(s),nxt(NULL),refs(0),
diff --git a/externals/grill/pool/main.cpp b/externals/grill/pool/main.cpp
index 4397a55b..135872b3 100644
--- a/externals/grill/pool/main.cpp
+++ b/externals/grill/pool/main.cpp
@@ -203,7 +203,7 @@ private:
 FLEXT_NEW_V("pool",pool);
 
 
-pooldata *pool::head,*pool::tail;
+pooldata *pool::head,*pool::tail;	
 
 
 V pool::setup(t_classid c)
diff --git a/externals/grill/pool/pool.cpp b/externals/grill/pool/pool.cpp
index f58bae5f..25bb0b79 100644
--- a/externals/grill/pool/pool.cpp
+++ b/externals/grill/pool/pool.cpp
@@ -11,9 +11,11 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #include "pool.h"
 
 #include <string.h>
-#include <fstream.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <fstream>
+
+using namespace std;
 
 #define VBITS 6
 #define DBITS 5
diff --git a/externals/grill/pool/pool.h b/externals/grill/pool/pool.h
index 59195555..e4a55647 100644
--- a/externals/grill/pool/pool.h
+++ b/externals/grill/pool/pool.h
@@ -19,7 +19,9 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #error You need at least flext version 0.4.2
 #endif
 
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
 
 typedef void V;
 typedef int I;
diff --git a/externals/grill/pool/pool.help b/externals/grill/pool/pool.help
index 959ca32f..9ec9715f 100755
--- a/externals/grill/pool/pool.help
+++ b/externals/grill/pool/pool.help
diff --git a/externals/grill/pool/pool.vcproj b/externals/grill/pool/pool.vcproj
index d4240f10..3b04751b 100644
--- a/externals/grill/pool/pool.vcproj
+++ b/externals/grill/pool/pool.vcproj
@@ -13,7 +13,7 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="Release|Win32"
+			Name="PD Release|Win32"
 			OutputDirectory=".\pd-msvc/r"
 			IntermediateDirectory=".\pd-msvc/r"
 			ConfigurationType="2"
@@ -79,7 +79,7 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
+			Name="PD Debug|Win32"
 			OutputDirectory=".\pd-msvc/d"
 			IntermediateDirectory=".\pd-msvc/d"
 			ConfigurationType="2"
@@ -145,6 +145,140 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Max Release|Win32"
+			OutputDirectory=".\max-msvc/r"
+			IntermediateDirectory=".\max-msvc/r"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="F:\prog\audio\MaxWinSDK\c74support\max-includes,F:\prog\audio\MaxWinSDK\c74support\msp-includes,f:\prog\max\flext\source"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS_MAX"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				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"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib"
+				OutputFile="max-msvc/pool.mxe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\release&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\release&quot;,f:\prog\max\flext\max-msvc"
+				ProgramDatabaseFile=".\pd-msvc/r/pool.pdb"
+				ImportLibrary=".\max-msvc/r/pool.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\pd-msvc/r/pool.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>
+		<Configuration
+			Name="Max Debug|Win32"
+			OutputDirectory=".\max-msvc/d"
+			IntermediateDirectory=".\max-msvc/d"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				AdditionalIncludeDirectories="F:\prog\audio\MaxWinSDK\c74support\max-includes,F:\prog\audio\MaxWinSDK\c74support\msp-includes,f:\prog\max\flext\source"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS_MAX"
+				StringPooling="TRUE"
+				RuntimeLibrary="1"
+				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="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib"
+				OutputFile="max-msvc/d/pool.mxe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\debug&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\debug&quot;,f:\prog\max\flext\max-msvc"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\max-msvc/d/pool.pdb"
+				ImportLibrary=".\max-msvc/r/pool.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\pd-msvc/r/pool.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>
@@ -152,7 +286,7 @@
 		<File
 			RelativePath="data.cpp">
 			<FileConfiguration
-				Name="Release|Win32">
+				Name="PD Release|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="2"
@@ -160,7 +294,7 @@
 					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="PD Debug|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="0"
@@ -169,11 +303,27 @@
 					BasicRuntimeChecks="3"
 					BrowseInformation="1"/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Max Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Max Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="main.cpp">
 			<FileConfiguration
-				Name="Release|Win32">
+				Name="PD Release|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="2"
@@ -181,7 +331,7 @@
 					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="PD Debug|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="0"
@@ -190,11 +340,27 @@
 					BasicRuntimeChecks="3"
 					BrowseInformation="1"/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Max Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Max Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="pool.cpp">
 			<FileConfiguration
-				Name="Release|Win32">
+				Name="PD Release|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="2"
@@ -202,7 +368,7 @@
 					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="PD Debug|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="0"
@@ -211,6 +377,22 @@
 					BasicRuntimeChecks="3"
 					BrowseInformation="1"/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Max Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Max Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="pool.dtd">