Made DSPSpy build in VC++ (when having devKitPro)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3121 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 79 insertions, 321 deletions

diff --git a/Source/DSPSpy/DSPSpy.vcproj b/Source/DSPSpy/DSPSpy.vcproj
index babe9f981c..791b7be0de 100644
--- a/Source/DSPSpy/DSPSpy.vcproj
+++ b/Source/DSPSpy/DSPSpy.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="DSPSpy"

 	ProjectGUID="{3877AA3E-9CC0-4ADF-8E71-272EE4443478}"

 	RootNamespace="DSPSpy"

@@ -11,6 +11,9 @@
 		<Platform

 			Name="Win32"

 		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

 	<ToolFiles>

 	</ToolFiles>

@@ -19,137 +22,86 @@
 			Name="Debug|Win32"

 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

+			ConfigurationType="0"

 			CharacterSet="2"

 			>

 			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

+				Name="VCNMakeTool"

+				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPToolD.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

+				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPToolD.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make"

+				CleanCommandLine="make clean"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

 			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="0"

+			CharacterSet="2"

+			>

 			<Tool

-				Name="VCPostBuildEventTool"

+				Name="VCNMakeTool"

+				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPToolD.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

+				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPToolD.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make"

+				CleanCommandLine="make clean"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

+			ConfigurationType="0"

 			CharacterSet="2"

 			WholeProgramOptimization="1"

 			>

 			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

+				Name="VCNMakeTool"

+				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

+				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make"

+				CleanCommandLine="make clean"

+				Output="DSPSpy.dol"

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

 			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="0"

+			CharacterSet="2"

+			WholeProgramOptimization="1"

+			>

 			<Tool

-				Name="VCPostBuildEventTool"

+				Name="VCNMakeTool"

+				BuildCommandLine="..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make&#x0D;&#x0A;"

+				ReBuildCommandLine="make clean&#x0D;&#x0A;..\..\Binary\$(PlatformName)\DSPTool.exe -h dsp_code tests\dsp_code.ds&#x0D;&#x0A;make"

+				CleanCommandLine="make clean"

+				Output="DSPSpy.dol"

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

 			/>

 		</Configuration>

 	</Configurations>

@@ -159,242 +111,42 @@
 		<File

 			RelativePath=".\asm.h"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\color.h"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\display.cpp"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\display_font.cpp"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\dsp.h"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-		</File>

-		<File

-			RelativePath=".\dsp_code.ds"

-			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-		</File>

-		<File

-			RelativePath=".\dspbuild.bat"

-			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\irq.h"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\main_spy.cpp"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\Makefile"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\mem_dump.h"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\processor.h"

 			>

-			<FileConfiguration

-				Name="Debug|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="Release|Win32"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCustomBuildTool"

-				/>

-			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln
index cbc90fb0cc..7f53d39f89 100644
--- a/Source/Dolphin.sln
+++ b/Source/Dolphin.sln
@@ -175,6 +175,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.
 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPSpy", "DSPSpy\DSPSpy.vcproj", "{3877AA3E-9CC0-4ADF-8E71-272EE4443478}"

+	ProjectSection(ProjectDependencies) = postProject

+		{1970D175-3DE8-4738-942A-4D98D1CDBF64} = {1970D175-3DE8-4738-942A-4D98D1CDBF64}

+	EndProjectSection

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -521,6 +524,7 @@ Global
 		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Release_JITIL|Win32.ActiveCfg = Release|Win32

 		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Release_JITIL|Win32.Build.0 = Release|Win32

 		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Release_JITIL|x64.ActiveCfg = Release|x64

+		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Release_JITIL|x64.Build.0 = Release|x64

 		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Release|Win32.ActiveCfg = Release|Win32

 		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Release|Win32.Build.0 = Release|Win32

 		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6}.Release|x64.ActiveCfg = Release|x64

@@ -551,7 +555,8 @@ Global
 		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}.DebugFast|x64.Build.0 = DebugFast|x64

 		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}.Release_JITIL|Win32.ActiveCfg = Release|Win32

 		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}.Release_JITIL|Win32.Build.0 = Release|Win32

-		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}.Release_JITIL|x64.ActiveCfg = Release|Win32

+		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}.Release_JITIL|x64.ActiveCfg = Release|x64

+		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}.Release_JITIL|x64.Build.0 = Release|x64

 		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}.Release|Win32.ActiveCfg = Release|Win32

 		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}.Release|Win32.Build.0 = Release|Win32

 		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}.Release|x64.ActiveCfg = Release|x64

@@ -566,19 +571,20 @@ Global
 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|x64.Build.0 = DebugFast|x64

 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release_JITIL|Win32.ActiveCfg = Release|Win32

 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release_JITIL|Win32.Build.0 = Release|Win32

-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release_JITIL|x64.ActiveCfg = Release|Win32

+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release_JITIL|x64.ActiveCfg = Release|x64

+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release_JITIL|x64.Build.0 = Release|x64

 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.ActiveCfg = Release|Win32

 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.Build.0 = Release|Win32

 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64

 		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64

 		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Debug|Win32.ActiveCfg = Debug|Win32

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Debug|x64.ActiveCfg = Debug|Win32

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Debug|x64.ActiveCfg = Debug|x64

 		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.DebugFast|Win32.ActiveCfg = Debug|Win32

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.DebugFast|x64.ActiveCfg = Debug|Win32

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.DebugFast|x64.ActiveCfg = Debug|x64

 		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release_JITIL|Win32.ActiveCfg = Release|Win32

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release_JITIL|x64.ActiveCfg = Release|Win32

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release_JITIL|x64.ActiveCfg = Release|x64

 		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release|Win32.ActiveCfg = Release|Win32

-		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release|x64.ActiveCfg = Release|Win32

+		{3877AA3E-9CC0-4ADF-8E71-272EE4443478}.Release|x64.ActiveCfg = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE