Add Release_JITIL configuration to use magumagu's JIT instead under windows (currently 32-bit only) (this is intended to be temporary). Add comment about crashes with JITIL in Burnout2 and Animal Crossing. Some warning disables and cleanups.

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

Source/Core/Common/Src/MappedFile.h

@@ -23,29 +23,25 @@
 #ifndef _MAPPED_FILE_H
 #define _MAPPED_FILE_H
 
-// #pragma warning (disable: 4786)
-
 #include <map>
 
 namespace Common
 {
 class IMappedFile
 {
-	public:
+public:
+	virtual ~IMappedFile() {}
 
-		virtual ~IMappedFile() {}
+	virtual bool Open(const char* _szFilename) = 0;
+	virtual bool IsOpen(void) = 0;
+	virtual void Close(void)  = 0;
+	virtual u64 GetSize(void) = 0;
+	virtual u8* Lock(u64 _offset, u64 _size) = 0;
+	virtual void Unlock(u8* ptr) = 0;
 
-
-		virtual bool Open(const char* _szFilename) = 0;
-		virtual bool IsOpen(void) = 0;
-		virtual void Close(void)  = 0;
-		virtual u64 GetSize(void) = 0;
-		virtual u8* Lock(u64 _offset, u64 _size) = 0;
-		virtual void Unlock(u8* ptr) = 0;
-
-		static IMappedFile* CreateMappedFileDEPRECATED();
+	static IMappedFile* CreateMappedFileDEPRECATED();
 };
-} // end of namespace DiscIO
+
+}  // namespace
 
 #endif
-

Source/Core/Core/Src/Core.cpp

@@ -579,10 +579,18 @@ void Callback_VideoCopiedToXFB()
 		char temp[256];
 		sprintf(temp, "FPS:%8.2f - Core: %s | %s - Speed: %i MHz [Real: %i + IdleSkip: %i] / %i MHz", 
 			(float)frames / t, 
+#ifdef JITTEST
+#ifdef _M_IX86
+			_CoreParameter.bUseJIT ? "JIT32IL" : "Int32", 
+#else
+			_CoreParameter.bUseJIT ? "JIT64IL" : "Int64", 
+#endif
+#else
 #ifdef _M_IX86
 			_CoreParameter.bUseJIT ? "JIT32" : "Int32", 
 #else
 			_CoreParameter.bUseJIT ? "JIT64" : "Int64", 
+#endif
 #endif
 			_CoreParameter.bUseDualCore ? "DC" : "SC",
 			(int)(diff),

Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp

@@ -51,6 +51,9 @@
 */
 // =============
 
+#ifdef _MSC_VER
+#pragma warning(disable : 4065)  // switch statement contains 'default' but no 'case' labels
+#endif
 
 #include "WII_IPC_HLE_Device_net.h"
 
@@ -204,7 +207,7 @@ bool CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress)
 
 	SIOCtlVBuffer CommandBuffer(_CommandAddress);
 
-	switch(CommandBuffer.Parameter)
+	switch (CommandBuffer.Parameter)
 	{
 	default:
 		LOG(WII_IPC_NET, "NET_NCD_MANAGE IOCtlV: %i", CommandBuffer.Parameter);

Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp

@@ -37,6 +37,10 @@
 #include "JitCache.h"
 #include "JitRegCache.h"
 
+#ifdef JITTEST
+#error Jit64 cannot have JITTEST define
+#endif
+
 using namespace Gen;
 using namespace PowerPC;
 

Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp

@@ -126,6 +126,10 @@ Fix profiled loads/stores to work safely.  On 32-bit, one solution is to
 
 */
 
+#ifdef _MSC_VER
+#pragma warning(disable:4146)   // unary minus operator applied to unsigned type, result still unsigned
+#endif
+
 #include "IR.h"
 #include "../PPCTables.h"
 #include "../../CoreTiming.h"
@@ -948,11 +952,19 @@ static OpArg regBuildMemAddress(RegInfo& RI, InstLoc I, InstLoc AI,
 	if (isImm(*AI)) {
 		unsigned addr = RI.Build->GetImmValue(AI);	
 		if (Memory::IsRAMAddress(addr)) {
+#ifdef _M_IX86
+			// 32-bit
 			if (dest)
 				*dest = regFindFreeReg(RI);
 			if (Profiled) 
 				return M((void*)((u32)Memory::base + (addr & Memory::MEMVIEW32_MASK)));
 			return M((void*)addr);
+#else
+			// 64-bit
+			if (Profiled) 
+				return M((void*)((u32)Memory::base + addr));
+			return M((void*)addr);
+#endif
 		}
 	}
 	unsigned offset;
@@ -1186,10 +1198,10 @@ static void DoWriteCode(IRBuilder* ibuild, Jit64* Jit, bool UseProfile) {
 	RI.MakeProfile = false;//!RI.UseProfile;
 	// Pass to compute liveness
 	ibuild->StartBackPass();
-	for (unsigned index = RI.IInfo.size() - 1; index != -1U; --index) {
+	for (unsigned int index = RI.IInfo.size() - 1; index != -1U; --index) {
 		InstLoc I = ibuild->ReadBackward();
-		unsigned op = getOpcode(*I);
-		bool thisUsed = regReadUse(RI, I);
+		unsigned int op = getOpcode(*I);
+		bool thisUsed = regReadUse(RI, I) ? true : false;
 		switch (op) {
 		default:
 			PanicAlert("Unexpected inst!");
@@ -1331,7 +1343,7 @@ static void DoWriteCode(IRBuilder* ibuild, Jit64* Jit, bool UseProfile) {
 	ibuild->StartForwardPass();
 	for (unsigned i = 0; i != RI.IInfo.size(); i++) {
 		InstLoc I = ibuild->ReadForward();
-		bool thisUsed = regReadUse(RI, I);
+		bool thisUsed = regReadUse(RI, I) ? true : false;
 		switch (getOpcode(*I)) {
 		case InterpreterFallback: {
 			unsigned InstCode = ibuild->GetImmValue(getOp1(I));
@@ -2063,13 +2075,15 @@ static void DoWriteCode(IRBuilder* ibuild, Jit64* Jit, bool UseProfile) {
 			exit(1);
 		}
 	}
+
 	for (unsigned i = 0; i < 8; i++) {
 		if (RI.regs[i]) {
-			PanicAlert("Incomplete cleanup!");
+			// Start a game in Burnout 2 to get this. Or animal crossing.
+			PanicAlert("Incomplete cleanup! (regs)");
 			exit(1);
 		}
 		if (RI.fregs[i]) {
-			PanicAlert("Incomplete cleanup!");
+			PanicAlert("Incomplete cleanup! (fregs)");
 			exit(1);
 		}
 	}

Source/Core/Core/Src/PowerPC/Jit64IL/IR.h

@@ -22,7 +22,6 @@
 #include <vector>
 
 namespace IREmitter {
-
 	enum Opcode {
 		Nop = 0,
 
@@ -484,9 +483,9 @@ namespace IREmitter {
 		InstLoc ReadForward() { return curReadPtr++; }
 		InstLoc ReadBackward() { return --curReadPtr; }
 		InstLoc getFirstInst() { return &InstList[0]; }
-		unsigned getNumInsts() { return InstList.size(); }
-		unsigned ReadInst(InstLoc I) { return *I; }
-		unsigned GetImmValue(InstLoc I);
+		unsigned int getNumInsts() { return (unsigned int)InstList.size(); }
+		unsigned int ReadInst(InstLoc I) { return *I; }
+		unsigned int GetImmValue(InstLoc I);
 
 		void Reset() {
 			InstList.clear();
@@ -509,7 +508,7 @@ namespace IREmitter {
 
 		IRBuilder() { Reset(); }
 
-		private:
+	private:
 		IRBuilder(IRBuilder&); // DO NOT IMPLEMENT
 		std::vector<Inst> InstList; // FIXME: We must ensure this is 
 					    // continuous!

Source/Core/Core/Src/PowerPC/Jit64IL/Jit.cpp

@@ -37,6 +37,10 @@
 #include "JitCache.h"
 #include "JitRegCache.h"
 
+#ifndef JITTEST
+#error JitIL needs JITTEST define
+#endif
+
 using namespace Gen;
 using namespace PowerPC;
 

Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp

@@ -220,7 +220,7 @@ void AsmRoutineManager::GenQuantizedStores() {
 	const u8* storePairedFloat = AlignCode4();
 #ifdef _M_X64
 	MOVQ_xmm(R(RAX), XMM0);
-	ROL(64, RAX, Imm8(32));
+	ROL(64, R(RAX), Imm8(32));
 	TEST(32, R(ECX), Imm32(0x0C000000));
 	FixupBranch argh = J_CC(CC_NZ);
 	BSWAP(64, RAX);
@@ -350,7 +350,7 @@ void AsmRoutineManager::GenQuantizedLoads() {
 #ifdef _M_X64
 		MOV(64, R(RCX), MComplex(RBX, RCX, 1, 0));
 		BSWAP(64, RCX);
-		ROL(64, RCX, Imm8(32));
+		ROL(64, R(RCX), Imm8(32));
 		MOVQ_xmm(XMM0, R(RCX));
 #else
 #if 0

Source/Core/Core/Src/PowerPC/Jit64IL/Jit_Integer.cpp

@@ -15,6 +15,10 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#ifdef _MSC_VER
+#pragma warning(disable:4146)  // unary minus operator applied to unsigned type, result still unsigned
+#endif
+
 #include "../../Core.h" // include "Common.h", "CoreParameter.h", SCoreStartupParameter
 #include "../PowerPC.h"
 #include "../PPCTables.h"
@@ -398,7 +402,7 @@
 	void Jit64::rlwnmx(UGeckoInstruction inst)
 	{
 		INSTRUCTION_START
-		unsigned mask = Helper_Mask(inst.MB, inst.ME);
+		unsigned int mask = Helper_Mask(inst.MB, inst.ME);
 		IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
 		val = ibuild.EmitRol(val, ibuild.EmitLoadGReg(inst.RB));
 		val = ibuild.EmitAnd(val, ibuild.EmitIntConst(mask));
@@ -481,7 +485,7 @@
 		IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS), test;
 		val = ibuild.EmitSarl(val, ibuild.EmitIntConst(inst.SH));
 		ibuild.EmitStoreGReg(val, inst.RA);
-		unsigned mask = -1u << inst.SH;
+		unsigned int mask = -1u << inst.SH;
 		test = ibuild.EmitOr(val, ibuild.EmitIntConst(mask & 0x7FFFFFFF));
 		test = ibuild.EmitICmpUgt(test, ibuild.EmitIntConst(mask));
 		

Source/Core/Core/Src/PowerPC/Jit64IL/Jit_LoadStore.cpp

@@ -108,9 +108,9 @@ void Jit64::lXzx(UGeckoInstruction inst)
 	switch (inst.SUBOP10 & ~32)
 	{
 	default: PanicAlert("lXzx: invalid access size");
-	case 23: val = ibuild.EmitLoad32(addr); break; //lwzx
+	case 23:  val = ibuild.EmitLoad32(addr); break; //lwzx
 	case 279: val = ibuild.EmitLoad16(addr); break; //lhzx
-	case 87: val = ibuild.EmitLoad8(addr);  break; //lbzx
+	case 87:  val = ibuild.EmitLoad8(addr);  break; //lbzx
 	}
 	ibuild.EmitStoreGReg(val, inst.RD);
 }

Source/Core/Core/Src/PowerPC/PPCTables.cpp

@@ -311,11 +311,7 @@ static GekkoOPTemplate table31[] =
 	{24,  Interpreter::slwx,    &Jit64::slwx,     {"slwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
 
 	{54,   Interpreter::dcbst,  &Jit64::Default,  {"dcbst",  OPTYPE_DCACHE, 0, 4}},
-#if JITTEST
 	{86,   Interpreter::dcbf,   &Jit64::DoNothing,  {"dcbf",   OPTYPE_DCACHE, 0, 4}},
-#else
-	{86,   Interpreter::dcbf,   &Jit64::Default,  {"dcbf",   OPTYPE_DCACHE, 0, 4}},
-#endif
 	{246,  Interpreter::dcbtst, &Jit64::Default,  {"dcbtst", OPTYPE_DCACHE, 0, 1}},
 	{278,  Interpreter::dcbt,   &Jit64::Default,  {"dcbt",   OPTYPE_DCACHE, 0, 1}},
 	{470,  Interpreter::dcbi,   &Jit64::Default,  {"dcbi",   OPTYPE_DCACHE, 0, 4}},

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="DolphinWX"
 	ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"
 	RootNamespace="DolphinWX"
@@ -89,7 +89,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib LZO.lib"
+				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib"
 				OutputFile="../../../Binary/Win32/DolphinWx.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -314,7 +314,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/TLBID:1"
-				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib LZO.lib"
+				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib"
 				OutputFile="../../../Binary/Win32/DolphinWxD.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -537,7 +537,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:msvcrt.lib&#x0D;&#x0A;/NODEFAULTLIB:libcmtd.lib"
-				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib LZO.lib"
+				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib"
 				OutputFile="../../../Binary/Win32/DolphinWxDF.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -689,6 +689,233 @@
 				ExcludedFromBuild="false"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release_JITIL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<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="1"
+				TypeLibraryName=".\vc_msw/toolbar.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="0"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="0"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
+				WarningLevel="4"
+				WarnAsError="false"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles=""
+			/>
+			<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 winmm.lib"
+				OutputFile="../../../Binary/Win32/DolphinWxIL.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib;..\..\..\Externals\LZO\win32\$(ConfigurationName)"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames="msvcrt"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				GenerateMapFile="false"
+				MapFileName="$(TargetDir)linkermap.map"
+				SubSystem="2"
+				BaseAddress="0x00400000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<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 /q /d&#x0D;&#x0A;echo Copying External .dlls&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\Cg\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\SDL\win32\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\WiiUse\Win32\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;"
+				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"
+			>
+			<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;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="false"
+				FloatingPointModel="0"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
+				WarningLevel="4"
+				WarnAsError="false"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles=""
+			/>
+			<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"
+				OutputFile="../../../Binary/x64/DolphinWxIL.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				SubSystem="2"
+				BaseAddress="0x00400000"
+				RandomizedBaseAddress="1"
+				FixedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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 /q /d&#x0D;&#x0A;echo Copying External .dlls&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\Cg64\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\SDL\x64\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\WiiUse\X64\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;"
+				ExcludedFromBuild="false"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -859,6 +1086,14 @@
 						WarnAsError="false"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_JITIL|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarnAsError="false"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\MemoryCards\GCMemcard.h"
@@ -984,6 +1219,22 @@
 					Name="VCCLCompilerTool"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release_JITIL|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release_JITIL|x64"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\..\..\readme.txt"
@@ -1044,6 +1295,22 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release_JITIL|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release_JITIL|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath=".\src\stdafx.h"