Added 64-bit compilation

Removed autodep optimisation.

1 files changed, 495 insertions, 13 deletions

diff --git a/tools/mhmake/mhmake.vcproj b/tools/mhmake/mhmake.vcproj
index 9aba27775..690701c3c 100644
--- a/tools/mhmake/mhmake.vcproj
+++ b/tools/mhmake/mhmake.vcproj
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="mhmake"

 	ProjectGUID="{7F1669C8-7974-45DF-9B71-0E2A8DC44C06}"

+	RootNamespace="mhmake"

 	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

 			Name="Win32"

 		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

 	<ToolFiles>

 	</ToolFiles>

@@ -60,10 +64,7 @@
 				RuntimeTypeInfo="false"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

-				PrecompiledHeaderFile=".\Release/mhmake.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

+				AssemblerListingLocation="$(IntDir)"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CallingConvention="1"

@@ -83,10 +84,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile=".\Release/mhmake.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\Release/mhmake.pdb"

+				ProgramDatabaseFile=""

 				SubSystem="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

@@ -115,6 +115,102 @@
 			/>

 		</Configuration>

 		<Configuration

+			Name="Release|x64"

+			OutputDirectory="Release64"

+			IntermediateDirectory="Release64"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\Release/mhmake.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="3"

+				InlineFunctionExpansion="2"

+				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories=".,src,src\parser"

+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"

+				StringPooling="true"

+				ExceptionHandling="2"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				EnableEnhancedInstructionSet="0"

+				RuntimeTypeInfo="false"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderThrough="stdafx.h"

+				AssemblerListingLocation="$(IntDir)"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CallingConvention="1"

+				CompileAs="0"

+				DisableSpecificWarnings="4996"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory=".\Debug"

 			IntermediateDirectory=".\Debug"

@@ -150,10 +246,8 @@
 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

-				PrecompiledHeaderFile=".\Debug/mhmake.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

+				AssemblerListingLocation="$(IntDir)"

+				XMLDocumentationFileName="$(IntDir)"

 				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

@@ -174,11 +268,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile=".\Debug/mhmake_dbg.exe"

+				OutputFile="$(OutDir)\mhmake_dbg.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/mhmake.pdb"

 				SubSystem="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

@@ -207,6 +300,97 @@
 			/>

 		</Configuration>

 		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="Debug64"

+			IntermediateDirectory="Debug64"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\Debug/mhmake.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".,src,src\parser"

+				PreprocessorDefinitions="_DEBUG;_CRTDBG_MAP_ALLOC;WIN32;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderThrough="stdafx.h"

+				AssemblerListingLocation="$(IntDir)"

+				XMLDocumentationFileName="$(IntDir)"

+				BrowseInformation="1"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+				DisableSpecificWarnings="4996"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\mhmake_dbg.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\Debug/mhmake.pdb"

+				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

 			Name="Profile|Win32"

 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

@@ -307,6 +491,108 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Profile|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\Release/mhmake.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="3"

+				InlineFunctionExpansion="2"

+				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories=".,src,src\parser"

+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"

+				StringPooling="true"

+				ExceptionHandling="0"

+				RuntimeLibrary="2"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				EnableEnhancedInstructionSet="1"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderThrough="stdafx.h"

+				PrecompiledHeaderFile="$(ConfigurationName)/mhmake.pch"

+				ProgramDataBaseFileName="$(IntDir)/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CallingConvention="1"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(ConfigurationName)/mhmake.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				GenerateMapFile="true"

+				MapExports="true"

+				SubSystem="1"

+				RandomizedBaseAddress="1"

+				FixedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -359,6 +645,14 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

@@ -367,6 +661,14 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Profile|Win32"

 					>

 					<Tool

@@ -374,6 +676,46 @@
 						UsePrecompiledHeader="1"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Profile|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug 64|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug 64|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release 64|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release 64|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\src\util.cpp"

@@ -435,6 +777,16 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makelex.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\flexskel.cc;.\src\flexskel.h;"

+						Outputs="src\parser\mhmakeLexer.cpp;src\parser\mhmakeLexer.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

@@ -445,6 +797,16 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makelex.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\flexskel.cc;.\src\flexskel.h;"

+						Outputs="src\parser\mhmakeLexer.cpp;src\parser\mhmakeLexer.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Profile|Win32"

 					>

 					<Tool

@@ -454,6 +816,56 @@
 						Outputs="src\parser\mhmakeLexer.cpp;src\parser\mhmakeLexer.h"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Profile|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makelex.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\flexskel.cc;.\src\flexskel.h;"

+						Outputs="src\parser\mhmakeLexer.cpp;src\parser\mhmakeLexer.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug 64|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makelex.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\flexskel.cc;.\src\flexskel.h;"

+						Outputs="src\parser\mhmakeLexer.cpp;src\parser\mhmakeLexer.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug 64|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makelex.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\flexskel.cc;.\src\flexskel.h;"

+						Outputs="src\parser\mhmakeLexer.cpp;src\parser\mhmakeLexer.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release 64|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makelex.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\flexskel.cc;.\src\flexskel.h;"

+						Outputs="src\parser\mhmakeLexer.cpp;src\parser\mhmakeLexer.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release 64|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makelex.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\flexskel.cc;.\src\flexskel.h;"

+						Outputs="src\parser\mhmakeLexer.cpp;src\parser\mhmakeLexer.h"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\src\mhmakeParser.y"

@@ -469,6 +881,16 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makebison.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\bison.cc;.\src\bison.h;"

+						Outputs="src\parser\mhmakeparser.cpp;src\parser\mhmakeparser.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

@@ -479,6 +901,16 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makebison.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\bison.cc;.\src\bison.h;"

+						Outputs="src\parser\mhmakeparser.cpp;src\parser\mhmakeparser.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Profile|Win32"

 					>

 					<Tool

@@ -488,6 +920,56 @@
 						Outputs="src\parser\mhmakeparser.cpp;src\parser\mhmakeparser.h"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Profile|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makebison.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\bison.cc;.\src\bison.h;"

+						Outputs="src\parser\mhmakeparser.cpp;src\parser\mhmakeparser.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug 64|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makebison.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\bison.cc;.\src\bison.h;"

+						Outputs="src\parser\mhmakeparser.cpp;src\parser\mhmakeparser.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug 64|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makebison.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\bison.cc;.\src\bison.h;"

+						Outputs="src\parser\mhmakeparser.cpp;src\parser\mhmakeparser.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release 64|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makebison.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\bison.cc;.\src\bison.h;"

+						Outputs="src\parser\mhmakeparser.cpp;src\parser\mhmakeparser.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release 64|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="cmd.exe /c makebison.bat&#x0D;&#x0A;"

+						AdditionalDependencies=".\src\bison.cc;.\src\bison.h;"

+						Outputs="src\parser\mhmakeparser.cpp;src\parser\mhmakeparser.h"

+					/>

+				</FileConfiguration>

 			</File>

 			<Filter

 				Name="Auto"