removed now obsolete build configurations Release_JITIL from vcproj and jittest from scons

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

3 files changed, 2 insertions, 317 deletions

diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj
index 2dfc782325..7732da0d93 100644
--- a/Source/Core/Core/Core.vcproj
+++ b/Source/Core/Core/Core.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="Core"

 	ProjectGUID="{F0B874CB-4476-4199-9315-8343D05AE684}"

 	RootNamespace="Core"

@@ -454,138 +454,6 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

-		<Configuration

-			Name="Release_JITIL|Win32"

-			ConfigurationType="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_JITIL|x64"

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

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

-			ConfigurationType="4"

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

-			CharacterSet="2"

-			WholeProgramOptimization="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				OmitFramePointers="true"

-				EnableFiberSafeOptimizations="false"

-				WholeProgramOptimization="false"

-				AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;JITTEST"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="0"

-				FloatingPointModel="0"

-				UsePrecompiledHeader="2"

-				AssemblerListingLocation="$(IntDir)\"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				ForcedIncludeFiles="stdafx.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/Core.lib"

-				AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -1621,14 +1489,6 @@
 					UsePrecompiledHeader="1"

 				/>

 			</FileConfiguration>

-			<FileConfiguration

-				Name="Release_JITIL|x64"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-					UsePrecompiledHeader="1"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\Src\stdafx.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp
index 6b0e43c1d0..4267102a14 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp
@@ -79,21 +79,12 @@ static GekkoOPTemplate primarytable[] =
 	{28, &JitIL::reg_imm}, //"andi_rc",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},

 	{29, &JitIL::reg_imm}, //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},

 

-#if JITTEST

 	{32, &JitIL::lXz}, //"lwz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},

 	{33, &JitIL::lXz}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},

 	{34, &JitIL::lXz}, //"lbz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},

 	{35, &JitIL::Default}, //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},

 	{40, &JitIL::lXz}, //"lhz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},

 	{41, &JitIL::lXz}, //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},

-#else

-	{32, &JitIL::lXz}, //"lwz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},

-	{33, &JitIL::Default}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},

-	{34, &JitIL::lXz}, //"lbz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},

-	{35, &JitIL::Default}, //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},

-	{40, &JitIL::lXz}, //"lhz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},

-	{41, &JitIL::Default}, //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},

-#endif

 	{42, &JitIL::lha}, //"lha",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},

 	{43, &JitIL::Default}, //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},

 

diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index 2919540d26..f8b8c85083 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="Dolphin"

 	ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"

 	RootNamespace="DolphinWX"

@@ -700,120 +700,6 @@
 				ExcludedFromBuild="false"

 			/>

 		</Configuration>

-		<Configuration

-			Name="Release_JITIL|x64"

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

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

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="&quot;$(ProjectDir)..\Common\SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)..\Common\src\svnrev_template.h&quot; &quot;$(ProjectDir)..\Common\src\svnrev.h&quot;"

-				ExcludedFromBuild="false"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="WIN32,__WXMSW__,_WINDOWS,NOPCH"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="3"

-				TypeLibraryName=".\vc_msw/toolbar.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				OmitFramePointers="false"

-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"

-				PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="false"

-				FloatingPointModel="0"

-				RuntimeTypeInfo="true"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"

-				AssemblerListingLocation="$(IntDir)\"

-				ObjectFile="$(IntDir)\"

-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

-				WarningLevel="4"

-				WarnAsError="false"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				ForcedIncludeFiles="stdafx.h"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="__WXMSW__,_WINDOWS,NOPCH"

-				Culture="1033"

-				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\msw;.\..\..\include;.;.\..\..\samples"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib rpcrt4.lib wxbase28u.lib wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_aui.lib Bochs_disasm.lib LZO.lib SFML_Network.lib zlib.lib"

-				OutputFile="../../../Binary/x64/DolphinIL.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="&quot;$(SolutionDir)\Release\$(PlatformName)&quot;;&quot;..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)&quot;"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"

-				SubSystem="2"

-				BaseAddress="0x00400000"

-				RandomizedBaseAddress="1"

-				FixedBaseAddress="1"

-				DataExecutionPrevention="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\vc_msw/toolbar.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				Description="Copying Data\* to $(TargetDir)"

-				CommandLine="xcopy &quot;$(SolutionDir)..\Data&quot; &quot;$(TargetDir)&quot; /s /e /y /d&#x0D;&#x0A;echo Copying External .dlls&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\Cg64\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /y /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\SDL\x64\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /y /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\WiiUse\X64\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /y /q /d&#x0D;&#x0A;"

-				ExcludedFromBuild="false"

-			/>

-		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -1089,15 +975,6 @@
 							ForcedIncludeFiles="$(NOINHERIT)"

 						/>

 					</FileConfiguration>

-					<FileConfiguration

-						Name="Release_JITIL|x64"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							UsePrecompiledHeader="0"

-							ForcedIncludeFiles="$(NOINHERIT)"

-						/>

-					</FileConfiguration>

 				</File>

 				<File

 					RelativePath=".\Src\NetFunctions.cpp"

@@ -1156,15 +1033,6 @@
 							ForcedIncludeFiles="$(NOINHERIT)"

 						/>

 					</FileConfiguration>

-					<FileConfiguration

-						Name="Release_JITIL|x64"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							UsePrecompiledHeader="0"

-							ForcedIncludeFiles="$(NOINHERIT)"

-						/>

-					</FileConfiguration>

 				</File>

 				<File

 					RelativePath=".\Src\NetSockets.cpp"

@@ -1223,15 +1091,6 @@
 							ForcedIncludeFiles="$(NOINHERIT)"

 						/>

 					</FileConfiguration>

-					<FileConfiguration

-						Name="Release_JITIL|x64"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							UsePrecompiledHeader="0"

-							ForcedIncludeFiles="$(NOINHERIT)"

-						/>

-					</FileConfiguration>

 				</File>

 				<File

 					RelativePath=".\Src\NetSockets.h"

@@ -1298,15 +1157,6 @@
 							ForcedIncludeFiles="$(NOINHERIT)"

 						/>

 					</FileConfiguration>

-					<FileConfiguration

-						Name="Release_JITIL|x64"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							UsePrecompiledHeader="0"

-							ForcedIncludeFiles="$(NOINHERIT)"

-						/>

-					</FileConfiguration>

 				</File>

 				<File

 					RelativePath=".\Src\NetWindow.h"

@@ -1441,14 +1291,6 @@
 					Name="VCCLCompilerTool"

 				/>

 			</FileConfiguration>

-			<FileConfiguration

-				Name="Release_JITIL|x64"

-				ExcludedFromBuild="true"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\..\..\readme.txt"

@@ -1509,14 +1351,6 @@
 					UsePrecompiledHeader="1"

 				/>

 			</FileConfiguration>

-			<FileConfiguration

-				Name="Release_JITIL|x64"

-				>

-				<Tool

-					Name="VCCLCompilerTool"

-					UsePrecompiledHeader="1"

-				/>

-			</FileConfiguration>

 		</File>

 		<File

 			RelativePath=".\src\stdafx.h"