2007-03-15 Jonathan Chambers <joncham@gmail.com>

	Revert previous patch.

svn path=/trunk/mono/; revision=74411

5 files changed, 160 insertions, 291 deletions

diff --git a/msvc/genmdesc.vcproj b/msvc/genmdesc.vcproj
index 1093ec881aa..c09a5cd01d3 100644
--- a/msvc/genmdesc.vcproj
+++ b/msvc/genmdesc.vcproj
@@ -106,7 +106,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"

+				CommandLine="runmdesc.bat $(TargetPath)"

 			/>

 		</Configuration>

 		<Configuration

@@ -199,7 +199,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"

+				CommandLine="runmdesc.bat $(TargetPath)"

 			/>

 		</Configuration>

 		<Configuration

@@ -290,7 +290,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"

+				CommandLine="runmdesc.bat $(TargetPath)"

 			/>

 		</Configuration>

 		<Configuration

@@ -382,7 +382,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"

+				CommandLine="runmdesc.bat $(TargetPath)"

 			/>

 		</Configuration>

 	</Configurations>

diff --git a/msvc/libmono.vcproj b/msvc/libmono.vcproj
index 57f377d7cee..eb285d945d2 100644
--- a/msvc/libmono.vcproj
+++ b/msvc/libmono.vcproj
@@ -132,7 +132,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"

-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

@@ -306,7 +306,7 @@
 				Optimization="0"

 				InlineFunctionExpansion="0"

 				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"

-				PreprocessorDefinitions="WIN64;_WIN64;_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE;__x86_64__"

+				PreprocessorDefinitions="WIN64;_WIN64;_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -3322,6 +3322,52 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\mono\mini\exceptions-x86.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+						BrowseInformation="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+						BrowseInformation="1"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\mono\mini\graph.c"

 				>

 				<FileConfiguration

@@ -3672,6 +3718,56 @@
 				>

 			</File>

 			<File

+				RelativePath="..\mono\mini\mini-x86.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+						BrowseInformation="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+						BrowseInformation="1"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\mono\mini\mini-x86.h"

+				>

+			</File>

+			<File

 				RelativePath="..\mono\mini\mini.c"

 				>

 				<FileConfiguration

@@ -3884,260 +3980,62 @@
 				>

 			</File>

 			<File

+				RelativePath="..\mono\mini\tramp-x86.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+						BrowseInformation="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+						BrowseInformation="1"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\mono\mini\wapihandles.c"

 				>

 			</File>

 			<Filter

 				Name="x86"

 				>

-				<File

-					RelativePath="..\mono\mini\exceptions-x86.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|x64"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-							BrowseInformation="1"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|x64"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-							BrowseInformation="1"

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\mono\mini\mini-x86.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|x64"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-							BrowseInformation="1"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|x64"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-							BrowseInformation="1"

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\mono\mini\mini-x86.h"

-					>

-					<FileConfiguration

-						Name="Release|x64"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCustomBuildTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|x64"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCustomBuildTool"

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\mono\mini\tramp-x86.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|x64"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-							BrowseInformation="1"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|x64"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-							UsePrecompiledHeader="0"

-							BrowseInformation="1"

-						/>

-					</FileConfiguration>

-				</File>

 			</Filter>

 			<Filter

-				Name="amd64"

-				>

-				<File

-					RelativePath="..\mono\mini\exceptions-amd64.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\mono\mini\mini-amd64.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\mono\mini\mini-amd64.h"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCustomBuildTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCustomBuildTool"

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\mono\mini\tramp-amd64.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						ExcludedFromBuild="true"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-				</File>

+				Name="x64"

+				>

 			</Filter>

 		</Filter>

 	</Files>

diff --git a/msvc/monoburg.vcproj b/msvc/monoburg.vcproj
index 0dd2618ca91..8fa9179d20c 100644
--- a/msvc/monoburg.vcproj
+++ b/msvc/monoburg.vcproj
@@ -27,7 +27,7 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

-				CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c&#x0D;&#x0A;"

+				CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -98,7 +98,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="runburg.bat $(TargetPath) $(PlatformName)"

+				CommandLine="runburg.bat $(TargetPath)"

 			/>

 		</Configuration>

 		<Configuration

@@ -110,7 +110,7 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

-				CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c&#x0D;&#x0A;"

+				CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -182,7 +182,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="runburg.bat $(TargetPath) $(PlatformName)"

+				CommandLine="runburg.bat $(TargetPath)"

 			/>

 		</Configuration>

 		<Configuration

@@ -194,7 +194,7 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

-				CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c&#x0D;&#x0A;"

+				CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -264,7 +264,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="runburg.bat $(TargetPath) $(PlatformName)"

+				CommandLine="runburg.bat $(TargetPath)"

 			/>

 		</Configuration>

 		<Configuration

@@ -276,7 +276,7 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

-				CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c&#x0D;&#x0A;"

+				CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -347,7 +347,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="runburg.bat $(TargetPath) $(PlatformName)"

+				CommandLine="runburg.bat $(TargetPath)"

 			/>

 		</Configuration>

 	</Configurations>

diff --git a/msvc/runburg.bat b/msvc/runburg.bat
index 8370b0ac7ef..7e36428b99a 100755
--- a/msvc/runburg.bat
+++ b/msvc/runburg.bat
@@ -1,23 +1,8 @@
 @echo off
 rem This runs Monoburg on the various x86 files when called on Visual Studio
-echo Running Monoburg on the inssel.brg files...
+echo Running Monoburg on the x86 inssel.brg files...
 cd ..\mono\mini
 set PATH=%PATH%;..\..\VSDependancies\lib
-
-if "%2" == "Win32" goto x86
-if "%2" == "x64" goto x64
-goto error
-:x86
-echo Platform detected is x86...
 %1 -c 1 -p -e inssel.brg inssel-float.brg inssel-long32.brg inssel-x86.brg -d inssel.h -s inssel.c
-goto end
-:x64
-echo Platform detected is x64...
-%1 -c 1 -p -e inssel.brg inssel-float.brg inssel-long.brg inssel-amd64.brg -d inssel.h -s inssel.c
-goto end
-:error
-echo Error: unsupported platform
-exit /b 100
-:end
 echo done
 
diff --git a/msvc/runmdesc.bat b/msvc/runmdesc.bat
index 09c03b6e49c..de31cced082 100755
--- a/msvc/runmdesc.bat
+++ b/msvc/runmdesc.bat
@@ -1,22 +1,8 @@
 @echo off
 rem This runs genmdesc on the x86 files when called on Visual Studio
-echo Running genmdesc
+echo Running genmdesc on the x86 files...
 cd ..\mono\mini
 set PATH=%PATH%;..\..\VSDependancies\lib
-if "%2" == "Win32" goto x86
-if "%2" == "x64" goto x64
-goto error
-:x86
-echo Platform detected is x86...
 %1 cpu-x86.md cpu-x86.h x86_desc
-goto end
-:x64
-echo Platform detected is x64...
-%1 cpu-amd64.md cpu-amd64.h amd64_desc
-goto end
-:error
-echo Error: unsupported platform
-exit /b 100
-:end
 echo done