diff --git a/desmume/src/GPU_osd.cpp b/desmume/src/GPU_osd.cpp
index dfef00ffd..49a7b8e88 100644
--- a/desmume/src/GPU_osd.cpp
+++ b/desmume/src/GPU_osd.cpp
@@ -550,7 +550,7 @@ void DrawHUD()
 		drawPad(Hud.GraphicalInputDisplay.x, Hud.GraphicalInputDisplay.y, 2.5);
 	}
 
-	#ifdef WIN32
+	#if defined(WIN32) && !defined(WXPORT)
 	if (CommonSettings.hud.ShowMicrophone) 
 	{
 		osd->addFixed(Hud.Microphone.x, Hud.Microphone.y, "%03d [%07d]",MicDisplay, Hud.cpuloopIterationCount);
diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h
index 9b62e9124..afcfe1e1e 100644
--- a/desmume/src/NDSSystem.h
+++ b/desmume/src/NDSSystem.h
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WXPORT)
 #include "pathsettings.h"
 #endif
 
diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp
index 6df113e5f..d1bd178a2 100644
--- a/desmume/src/OGLRender.cpp
+++ b/desmume/src/OGLRender.cpp
@@ -44,7 +44,7 @@ static void ENDGL() {
 		oglrender_endOpenGL();
 }
 
-#ifdef _WIN32
+#ifdef _WIN32 && !defined(WXPORT)
 	#define WIN32_LEAN_AND_MEAN
 	#include <windows.h>
 	#include <GL/gl.h>
diff --git a/desmume/src/lua-engine.cpp b/desmume/src/lua-engine.cpp
index 3833f021c..901c13966 100644
--- a/desmume/src/lua-engine.cpp
+++ b/desmume/src/lua-engine.cpp
@@ -11,12 +11,14 @@
 #include "GPU_osd.h"
 #include "saves.h"
 #include "emufile.h"
-#ifdef WIN32
+#if defined(WIN32) && !defined(WXPORT)
 #include "main.h"
 #include "windows.h"
 #include "video.h"
 #endif
 
+using namespace std;
+
 
 // functions that maybe aren't part of the Lua engine
 // but didn't make sense to add to BaseDriver (at least not yet)
@@ -424,7 +426,7 @@ static int doPopup(lua_State* L, const char* deftype, const char* deficon)
 
 	static const char * const titles [] = {"Notice", "Question", "Warning", "Error"};
 	const char* answer = "ok";
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(WXPORT)
 	static const int etypes [] = {MB_OK, MB_YESNO, MB_YESNOCANCEL, MB_OKCANCEL, MB_ABORTRETRYIGNORE};
 	static const int eicons [] = {MB_ICONINFORMATION, MB_ICONQUESTION, MB_ICONWARNING, MB_ICONERROR};
 //	DialogsOpen++;
@@ -1274,7 +1276,7 @@ bool luabitop_validate(lua_State *L) // originally named as luaopen_bit
   if (b != (UBits)1437217655L || BAD_SAR) {  /* Perform a simple self-test. */
     const char *msg = "compiled with incompatible luaconf.h";
 #ifdef LUA_NUMBER_DOUBLE
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(WXPORT)
     if (b == (UBits)1610612736L)
       msg = "use D3DCREATE_FPU_PRESERVE with DirectX";
 #endif
@@ -1346,7 +1348,7 @@ void indicateBusy(lua_State* L, bool busy)
 		lua_pop(L, 1);
 	}
 */
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(WXPORT)
 	int uid = luaStateToUIDMap[L->l_G->mainthread];
 	HWND hDlg = (HWND)uid;
 	char str [1024];
@@ -1400,7 +1402,7 @@ void LuaRescueHook(lua_State* L, lua_Debug *dbg)
 		if(!info.panic)
 		{
 			SPU_ClearOutputBuffer();
-#if defined(ASK_USER_ON_FREEZE) && defined(_WIN32)
+#if defined(ASK_USER_ON_FREEZE) && defined(_WIN32) && !defined(WXPORT)
 			DialogsOpen++;
 			int answer = MessageBox(HWnd, "A Lua script has been running for quite a while. Maybe it is in an infinite loop.\n\nWould you like to stop the script?\n\n(Yes to stop it now,\n No to keep running and not ask again,\n Cancel to keep running but ask again later)", "Lua Alert", MB_YESNOCANCEL | MB_DEFBUTTON3 | MB_ICONASTERISK);
 			DialogsOpen--;
@@ -2508,7 +2510,7 @@ static void prepare_reading()
 	}
 	else
 	{
-#ifdef WIN32
+#if defined(WIN32) && !defined(WXPORT)
 		extern VideoInfo video;
 		curGuiData.data = video.buffer;
 		curGuiData.stridePix = 256;
@@ -3356,7 +3358,7 @@ static void GetCurrentScriptDir(char* buffer, int bufLen)
 
 DEFINE_LUA_FUNCTION(emu_openscript, "filename")
 {
-#ifdef WIN32
+#if defined(WIN32) && !defined(WXPORT)
 	char curScriptDir[1024]; GetCurrentScriptDir(curScriptDir, 1024); // make sure we can always find scripts that are in the same directory as the current script
 	const char* filename = lua_isstring(L,1) ? lua_tostring(L,1) : NULL;
 	extern const char* OpenLuaScript(const char* filename, const char* extraDirToCheck, bool makeSubservient);
@@ -3536,7 +3538,7 @@ DEFINE_LUA_FUNCTION(sound_clear, "")
 	return 0;
 }
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(WXPORT)
 const char* s_keyToName[256] =
 {
 	NULL,
@@ -3650,7 +3652,7 @@ DEFINE_LUA_FUNCTION(input_getcurrentinputstatus, "")
 {
 	lua_newtable(L);
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(WXPORT)
 	// keyboard and mouse button status
 	{
 		int BackgroundInput = 0;//TODO
diff --git a/desmume/src/path.h b/desmume/src/path.h
index 58bfbac82..f87c45782 100644
--- a/desmume/src/path.h
+++ b/desmume/src/path.h
@@ -1,6 +1,6 @@
 #include <string>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WXPORT)
 #include "resource.h"
 #else
 #include <glib.h>
@@ -312,7 +312,7 @@ public:
 
 	enum ImageFormat
 	{
-#ifdef WIN32
+#if defined(WIN32) && !defined(WXPORT)
 		PNG = IDC_PNG,
 		BMP = IDC_BMP
 #else
diff --git a/desmume/src/version.cpp b/desmume/src/version.cpp
index e55413073..83280c3a9 100644
--- a/desmume/src/version.cpp
+++ b/desmume/src/version.cpp
@@ -21,7 +21,7 @@
 #include "version.h"
 
 //todo - everyone will want to support this eventually, i suppose
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(WXPORT)
 #include "svnrev.h"
 #else
 #ifdef SVN_REV
diff --git a/desmume/src/wifi.cpp b/desmume/src/wifi.cpp
index de2655a1a..e53f70e23 100644
--- a/desmume/src/wifi.cpp
+++ b/desmume/src/wifi.cpp
@@ -32,7 +32,9 @@
 	#include <ws2tcpip.h>
 	#define socket_t    SOCKET 	 
 	#define sockaddr_t  SOCKADDR
-	#include "windriver.h"
+	#ifndef WXPORT
+		#include "windriver.h"
+	#endif
 #else
 	#include <unistd.h> 	 
 	#include <stdlib.h> 	 
diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index f9c26048b..44623d37c 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -48,6 +48,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				Optimization="0"
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
@@ -1576,6 +1577,14 @@
 			<File
 				RelativePath="..\wxdlg\wxdlg3dViewer.cpp"
 				>
+				<FileConfiguration
+					Name="Release FastBuild|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						GeneratePreprocessedFile="1"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\wxdlg\wxdlg3dViewer.h"
diff --git a/desmume/src/windows/config.h b/desmume/src/windows/config.h
index fbf96dd8e..4e595bcd4 100644
--- a/desmume/src/windows/config.h
+++ b/desmume/src/windows/config.h
@@ -1,6 +1,8 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
+#if !defined(WXPORT)
 #include "userconfig.h"
+#endif
 
 #endif
diff --git a/desmume/src/wx/7z.dll b/desmume/src/wx/7z.dll
new file mode 100644
index 000000000..95093da8a
Binary files /dev/null and b/desmume/src/wx/7z.dll differ
diff --git a/desmume/src/wx/7z.exe b/desmume/src/wx/7z.exe
new file mode 100644
index 000000000..789d08922
Binary files /dev/null and b/desmume/src/wx/7z.exe differ
diff --git a/desmume/src/wx/DeSmuME_x64.manifest b/desmume/src/wx/DeSmuME_x64.manifest
new file mode 100644
index 000000000..eb4b02149
--- /dev/null
+++ b/desmume/src/wx/DeSmuME_x64.manifest
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="DeSmuME"
+    processorArchitecture="amd64"
+    version="1.0.0.0"
+    type="win32"/>
+<description>DeSmuME</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="amd64"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/desmume/src/wx/DeSmuME_x86.manifest b/desmume/src/wx/DeSmuME_x86.manifest
new file mode 100644
index 000000000..4e25cd13f
--- /dev/null
+++ b/desmume/src/wx/DeSmuME_x86.manifest
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="DeSmuME"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>DeSmuME</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/desmume/src/wx/IniFile.cpp b/desmume/src/wx/IniFile.cpp
index 0a6e54f9e..1e70fb362 100644
--- a/desmume/src/wx/IniFile.cpp
+++ b/desmume/src/wx/IniFile.cpp
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <strings.h>
+#include <string.h>
 
 #include <string>
 #include <vector>
diff --git a/desmume/src/wx/InputCommon/DirectInputBase.h b/desmume/src/wx/InputCommon/DirectInputBase.h
index 770fa258d..8c89c7385 100644
--- a/desmume/src/wx/InputCommon/DirectInputBase.h
+++ b/desmume/src/wx/InputCommon/DirectInputBase.h
@@ -26,7 +26,7 @@
 #include <stdio.h>
 
 #define DIRECTINPUT_VERSION 0x0800 // DirectInput
-#include <dinput.h>
+#include <directx/dinput.h>
 
 //#include "ConsoleWindow.h" // Common
 
diff --git a/desmume/src/wx/InputCommon/EventHandler.cpp b/desmume/src/wx/InputCommon/EventHandler.cpp
index f2b210322..47adce6c4 100644
--- a/desmume/src/wx/InputCommon/EventHandler.cpp
+++ b/desmume/src/wx/InputCommon/EventHandler.cpp
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#if defined HAVE_WX && HAVE_WX
+#if defined(HAVE_WX)
 #include <wx/wx.h>
 #endif
 
@@ -98,7 +98,7 @@ bool EventHandler::TestEvent (Keys k, sf::Event e)
     return (false);
 }
 
-#if defined HAVE_WX && HAVE_WX 
+#if defined(HAVE_WX)
 // Taken from wxw source code
 sf::Key::Code EventHandler::wxCharCodeToSF(int id)
 {
diff --git a/desmume/src/wx/InputCommon/EventHandler.h b/desmume/src/wx/InputCommon/EventHandler.h
index 1529a58b5..03a4afb17 100644
--- a/desmume/src/wx/InputCommon/EventHandler.h
+++ b/desmume/src/wx/InputCommon/EventHandler.h
@@ -54,7 +54,7 @@ public:
     static void Destroy();
     bool addEvent(sf::Event *e);
     static bool TestEvent (Keys k, sf::Event e);
-#if defined HAVE_WX && HAVE_WX
+#if defined(HAVE_WX)
     static sf::Key::Code wxCharCodeToSF(int id);
 #endif
     static void SFKeyToString(sf::Key::Code keycode, char *keyStr);
diff --git a/desmume/src/wx/PadSimple/PadSimple.cpp b/desmume/src/wx/PadSimple/PadSimple.cpp
index 16ac781ab..ae15a9562 100644
--- a/desmume/src/wx/PadSimple/PadSimple.cpp
+++ b/desmume/src/wx/PadSimple/PadSimple.cpp
@@ -30,7 +30,7 @@
 //#include "FileUtil.h"
 //#include "ChunkFile.h"
 
-#if defined(HAVE_WX) && HAVE_WX
+#if defined(HAVE_WX)
 	#include "GUI/ConfigDlg.h"
 	PADConfigDialogSimple* m_ConfigFrame = NULL;
 #endif
@@ -68,7 +68,7 @@ SPADInitialize g_PADInitialize;
 #ifdef _WIN32
 //HINSTANCE g_hInstance;
 
-#if defined(HAVE_WX) && HAVE_WX
+#if defined(HAVE_WX)
 class wxDLLApp : public wxApp
 {
 	bool OnInit()
@@ -88,7 +88,7 @@ BOOL APIENTRY aMain(HINSTANCE hinstDLL,	// DLL module handle
 	{
 	case DLL_PROCESS_ATTACH:
 		{
-#if defined(HAVE_WX) && HAVE_WX
+#if defined(HAVE_WX)
 			wxSetInstance((HINSTANCE)hinstDLL);
 			int argc = 0;
 			char **argv = NULL;
@@ -100,7 +100,7 @@ BOOL APIENTRY aMain(HINSTANCE hinstDLL,	// DLL module handle
 		break;
 
 	case DLL_PROCESS_DETACH:
-#if defined(HAVE_WX) && HAVE_WX
+#if defined(HAVE_WX)
 		wxEntryCleanup();
 #endif
 		break;
@@ -113,7 +113,7 @@ BOOL APIENTRY aMain(HINSTANCE hinstDLL,	// DLL module handle
 }
 #endif
 
-#if defined(HAVE_WX) && HAVE_WX
+#if defined(HAVE_WX)
 wxWindow* GetParentedWxWindow(HWND Parent)
 {
 #ifdef _WIN32
diff --git a/desmume/src/wx/touch.exe b/desmume/src/wx/touch.exe
new file mode 100644
index 000000000..0666a1f62
Binary files /dev/null and b/desmume/src/wx/touch.exe differ
diff --git a/desmume/src/wx/un7z_and_touch.bat b/desmume/src/wx/un7z_and_touch.bat
new file mode 100644
index 000000000..11920212d
--- /dev/null
+++ b/desmume/src/wx/un7z_and_touch.bat
@@ -0,0 +1,2 @@
+7z x -bd -y -o.libs %1
+touch %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file
diff --git a/desmume/src/wx/wxDeSmuME_2008.sln b/desmume/src/wx/wxDeSmuME_2008.sln
new file mode 100644
index 000000000..86dc02afa
--- /dev/null
+++ b/desmume/src/wx/wxDeSmuME_2008.sln
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxDeSmuME_VS2008", "wxDeSmuME_2008.vcproj", "{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Dev+|Win32 = Dev+|Win32
+		Dev+|x64 = Dev+|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.Build.0 = Debug|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.ActiveCfg = Debug|x64
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.Build.0 = Debug|x64
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|Win32.ActiveCfg = Dev+|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|Win32.Build.0 = Dev+|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x64.ActiveCfg = Dev+|x64
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x64.Build.0 = Dev+|x64
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.ActiveCfg = Release|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.Build.0 = Release|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.ActiveCfg = Release|x64
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/desmume/src/wx/wxDeSmuME_2008.vcproj b/desmume/src/wx/wxDeSmuME_2008.vcproj
new file mode 100644
index 000000000..16a4efbaa
--- /dev/null
+++ b/desmume/src/wx/wxDeSmuME_2008.vcproj
@@ -0,0 +1,1660 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="wxDeSmuME_VS2008"
+	ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
+	RootNamespace="DeSmuME"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+		<DefaultToolFile
+			FileName="masm.rules"
+		/>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)\__bins"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="false"
+				FavorSizeOrSpeed="0"
+				EnableFiberSafeOptimizations="false"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows"
+				PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;NOMINMAX;HAVE_LIBZ;WXPORT"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				BufferSecurityCheck="true"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
+				DebugInformationFormat="4"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32-debug.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
+				AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
+				DelayLoadDLLs=""
+				GenerateDebugInformation="true"
+				GenerateMapFile="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x86.manifest"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)\__bins"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="false"
+				FavorSizeOrSpeed="0"
+				EnableFiberSafeOptimizations="false"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows"
+				PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;BETA_VERSION;NOMINMAX;HAVE_LIBZ;WXPORT"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				BufferSecurityCheck="true"
+				EnableEnhancedInstructionSet="0"
+				FloatingPointModel="2"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib winpcap\x64\wpcap.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe"
+				AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
+				DelayLoadDLLs="wpcap.dll"
+				GenerateDebugInformation="true"
+				GenerateMapFile="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x64.manifest"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)\__bins"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;WXPORT"
+				StringPooling="true"
+				ExceptionHandling="1"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="false"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_release.exe"
+				AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
+				DelayLoadDLLs=""
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				Profile="false"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x86.manifest"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)\__bins"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;WXPORT"
+				StringPooling="true"
+				ExceptionHandling="1"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="false"
+				EnableEnhancedInstructionSet="0"
+				FloatingPointModel="2"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib winpcap\x64\wpcap.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_x64_release.exe"
+				AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
+				DelayLoadDLLs="wpcap.dll"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+				Profile="false"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x64.manifest"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Dev+|Win32"
+			OutputDirectory="$(SolutionDir)\__bins"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD;DEVELOPER;EXPERIMENTAL_WIFI_COMM;WXPORT"
+				StringPooling="true"
+				ExceptionHandling="1"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="false"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_dev+.exe"
+				AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
+				DelayLoadDLLs=""
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				LinkTimeCodeGeneration="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				Profile="false"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x86.manifest"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Dev+|x64"
+			OutputDirectory="$(SolutionDir)\__bins"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories=".;..;..\windows\lua\include;&quot;..\windows\glib-2.20.1\build&quot;;&quot;..\windows\glib-2.20.1\build\glib&quot;;..\windows\zlib123;..\windows\zziplib;..\windows\winpcap;..\windows\7z;..\windows\agg\include;..\windows\examples;..\windows\wx\include;..\windows"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;WXPORT"
+				StringPooling="true"
+				ExceptionHandling="1"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="false"
+				EnableEnhancedInstructionSet="0"
+				FloatingPointModel="2"
+				WarningLevel="1"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib shlwapi.lib winpcap\x64\wpcap.lib"
+				OutputFile="$(OutDir)\$(ProjectName)_x64_dev+.exe"
+				AdditionalLibraryDirectories="..\windows\zlib123;..\windows\agg;.libs"
+				DelayLoadDLLs="wpcap.dll"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				LinkTimeCodeGeneration="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+				Profile="false"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x64.manifest"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Core"
+			>
+			<File
+				RelativePath="..\addons.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\addons.h"
+				>
+			</File>
+			<File
+				RelativePath="..\aggdraw.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\arm_instructions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\arm_instructions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\armcpu.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\armcpu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\bios.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\bios.h"
+				>
+			</File>
+			<File
+				RelativePath="..\bits.h"
+				>
+			</File>
+			<File
+				RelativePath="..\cheatSystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cheatSystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\commandline.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CallingConvention="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CallingConvention="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Dev+|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CallingConvention="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release FastBuild|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CallingConvention="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\commandline.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\cp15.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cp15.h"
+				>
+			</File>
+			<File
+				RelativePath="..\debug.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\debug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Disassembler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Disassembler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\driver.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\driver.h"
+				>
+			</File>
+			<File
+				RelativePath="..\emufile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\emufile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\fat.h"
+				>
+			</File>
+			<File
+				RelativePath="..\FIFO.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\FIFO.h"
+				>
+			</File>
+			<File
+				RelativePath="..\firmware.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\firmware.h"
+				>
+			</File>
+			<File
+				RelativePath="..\fs-windows.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\fs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\gfx3d.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\gfx3d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\GPU.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\GPU.h"
+				>
+			</File>
+			<File
+				RelativePath="..\GPU_OSD.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\GPU_osd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\instruction_tabdef.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\lua-engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\lua-engine.h"
+				>
+			</File>
+			<File
+				RelativePath="..\matrix.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\matrix.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\mc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\MMU.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\MMU.h"
+				>
+			</File>
+			<File
+				RelativePath="..\MMU_timing.h"
+				>
+			</File>
+			<File
+				RelativePath="..\movie.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\movie.h"
+				>
+			</File>
+			<File
+				RelativePath="..\NDSSystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\NDSSystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\OGLRender.h"
+				>
+			</File>
+			<File
+				RelativePath="..\path.h"
+				>
+			</File>
+			<File
+				RelativePath="..\rasterize.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\rasterize.h"
+				>
+			</File>
+			<File
+				RelativePath="..\readwrite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\readwrite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\registers.h"
+				>
+			</File>
+			<File
+				RelativePath="..\render3D.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\render3D.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ROMReader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ROMReader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\rtc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\rtc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\saves.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\saves.h"
+				>
+			</File>
+			<File
+				RelativePath="..\shaders.h"
+				>
+			</File>
+			<File
+				RelativePath="..\softrender.h"
+				>
+			</File>
+			<File
+				RelativePath="..\softrender_config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\softrender_desmumefont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\softrender_v3sysfont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\SPU.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\SPU.h"
+				>
+			</File>
+			<File
+				RelativePath="..\texcache.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\texcache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\thumb_instructions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\thumb_instructions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\thumb_tabdef.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\version.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\wifi.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\wifi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\utils\xstring.h"
+				>
+			</File>
+			<Filter
+				Name="addons"
+				>
+				<File
+					RelativePath="..\addons\compactFlash.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\expMemory.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\gbagame.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\guitarGrip.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\none.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\rumblepak.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="gdbstub"
+				>
+				<File
+					RelativePath="..\gdbstub\gdbstub.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\gdbstub.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="utils"
+				>
+				<File
+					RelativePath="..\utils\ConvertUTF.c"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\ConvertUTF.h"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\guid.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\guid.h"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\md5.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\md5.h"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\task.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\task.h"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\valuearray.h"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\xstring.cpp"
+					>
+				</File>
+				<Filter
+					Name="decrypt"
+					>
+					<File
+						RelativePath="..\utils\decrypt\crc.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\crc.h"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\decrypt.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\decrypt.h"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\header.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\header.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="metaspu"
+				>
+				<File
+					RelativePath="..\metaspu\metaspu.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\metaspu\metaspu.h"
+					>
+				</File>
+				<File
+					RelativePath="..\metaspu\SndOut.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\metaspu\SndOut.h"
+					>
+				</File>
+				<File
+					RelativePath="..\metaspu\Timestretcher.cpp"
+					>
+				</File>
+				<Filter
+					Name="win32"
+					>
+					<File
+						RelativePath="..\metaspu\win32\ConfigSoundtouch.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\win32\Dialogs.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="SoundTouch"
+					>
+					<File
+						RelativePath="..\metaspu\SoundTouch\3dnow_win.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\AAFilter.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\AAFilter.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\BPMDetect.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\cpu_detect.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\cpu_detect_x86_win.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\FIFOSampleBuffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\FIFOSampleBuffer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\FIFOSamplePipe.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\FIRFilter.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\FIRFilter.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\mmx_optimized.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\RateTransposer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\RateTransposer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\SoundTouch.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\SoundTouch.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\sse_optimized.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\STTypes.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\TDStretch.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\TDStretch.h"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\WavFile.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\metaspu\SoundTouch\WavFile.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="wxdlg"
+				>
+				<File
+					RelativePath="..\wxdlg\wxdlg3dViewer.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							IgnoreStandardIncludePath="false"
+							GeneratePreprocessedFile="0"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\wxdlg\wxdlg3dViewer.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="windows"
+			>
+			<File
+				RelativePath="..\windows\console.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\windows\mic.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="wx"
+			>
+			<File
+				RelativePath=".\IniFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\IniFile.h"
+				>
+			</File>
+			<File
+				RelativePath=".\LuaWindow.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\LuaWindow.h"
+				>
+			</File>
+			<File
+				RelativePath=".\StringUtil.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\StringUtil.h"
+				>
+			</File>
+			<File
+				RelativePath=".\wxMain.cpp"
+				>
+			</File>
+			<Filter
+				Name="PadSimple"
+				>
+				<File
+					RelativePath=".\PadSimple\PadSimple.h"
+					>
+				</File>
+				<File
+					RelativePath=".\PadSimple\pluginspecs_pad.h"
+					>
+				</File>
+				<Filter
+					Name="GUI"
+					>
+					<File
+						RelativePath=".\PadSimple\GUI\ConfigDlg.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="InputCommon"
+				>
+				<File
+					RelativePath=".\InputCommon\DirectInputBase.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\InputCommon\DirectInputBase.h"
+					>
+				</File>
+				<File
+					RelativePath=".\InputCommon\Event.hpp"
+					>
+				</File>
+				<File
+					RelativePath=".\InputCommon\EventHandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\InputCommon\EventHandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\InputCommon\InputCommon.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\InputCommon\InputCommon.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="libs"
+			>
+			<File
+				RelativePath=".\7z\7z.7z"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\7z.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\7z.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\7z.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\7z.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Dev+|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\7z.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release FastBuild|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\7z\7z.7z .libs\7z*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\7z.tag"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\directx\directx.7z"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\directx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\directx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\directx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\directx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Dev+|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\directx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release FastBuild|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\directx\directx.7z .libs\directx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\directx.tag"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\glib-2.20.1\glib-2.20.1.7z"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\glib-vc8.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\glib-vc8.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\glib-vc8.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\glib-vc8.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Dev+|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\glib-vc8.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release FastBuild|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\glib-2.20.1\glib-2.20.1.7z .libs\glib*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\glib-vc8.tag"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\lua\lua.7z"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\lua.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\lua.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\lua.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\lua.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Dev+|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\lua.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release FastBuild|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\lua\lua.7z .libs\lua*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\lua.tag"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\wx\wx.7z"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\wx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\wx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\wx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\wx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Dev+|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*&#x0D;&#x0A;"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\wx.tag"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release FastBuild|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="un7z_and_touch.bat ..\windows\wx\wx.7z .libs\wx*"
+						AdditionalDependencies="7z.exe;un7z_and_touch.bat"
+						Outputs=".libs\wx.tag"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="resources.rc"
+		/>
+	</Globals>
+</VisualStudioProject>
diff --git a/desmume/src/wx/wxMain.cpp b/desmume/src/wx/wxMain.cpp
index e4ebbd0be..2ffb3f6d3 100644
--- a/desmume/src/wx/wxMain.cpp
+++ b/desmume/src/wx/wxMain.cpp
@@ -18,6 +18,10 @@
 #include "rasterize.h"
 #include "OGLRender.h"
 
+#ifdef WIN32
+#include "snddx.h"
+#endif
+
 #include <wx/stdpaths.h>
 
 #include "LuaWindow.h"
@@ -31,7 +35,7 @@
 SoundInterface_struct *SNDCoreList[] = {
         &SNDDummy,
 #ifdef WIN32
-        &SNDDIRECTX,
+//        &SNDDIRECTX,
 #else
         &SNDSDL,
 #endif
@@ -39,10 +43,12 @@ SoundInterface_struct *SNDCoreList[] = {
 };
 
 GPU3DInterface *core3DList[] = {
-        &gpu3DNull,
-        &gpu3Dgl,
         &gpu3DRasterize,
-        NULL
+#ifndef WIN32
+        &gpu3Dgl,
+#endif
+        &gpu3DNull,
+		NULL
 };
 
 /* lua stuff stubs */
@@ -93,7 +99,11 @@ public:
 
 		SPADStatus s;
 		memset(&s,0,sizeof(s));
+
+		//TODO !!!!!!!!!!!!!!!!!!!!!! FIXME!!!!!!!!!!1
+#ifndef _MSC_VER
 		PAD_GetStatus(0, &s);
+#endif
 
 		if(s.button & PAD_BUTTON_LEFT)
 			left = true;
@@ -309,7 +319,9 @@ public:
 
 	void OnOpenControllerConfiguration(wxCommandEvent& WXUNUSED (event))
 	{
+#ifndef _MSC_VER
 		new PADConfigDialogSimple(this);
+#endif
 	}
 
 	wxMenu* MakeStatesSubMenu( int baseid ) const
@@ -438,6 +450,7 @@ bool Desmume::OnInit()
 
 	Desmume_InitOnce();
 	aggDraw.hud->attach((u8*)GPU_screen, 256, 384, 1024);//TODO
+	NDS_3D_ChangeCore(0);
 
 #ifdef __WIN32__
 	extern void OpenConsole();
@@ -459,7 +472,9 @@ bool Desmume::OnInit()
 	SPADInitialize PADInitialize;
 	PADInitialize.padNumber = 1;
 	extern void Initialize(void *init);
+#ifndef _WIN32
 	Initialize(&PADInitialize);
+#endif
 
 	//TODO
 	addon_type = NDS_ADDON_NONE;
@@ -561,3 +576,22 @@ DesmumeFrame::DesmumeFrame(const wxString& title)
 	//	CreateStatusBar(2);
 	//	SetStatusText("Welcome to Desmume!");
 }
+
+#ifdef _WIN32
+/*
+* The thread handling functions needed by the GDB stub code.
+*/
+void *
+createThread_gdb( void (APIENTRY *thread_function)( void *data),
+				 void *thread_data) {
+					 void *new_thread = CreateThread( NULL, 0,
+						 (LPTHREAD_START_ROUTINE)thread_function, thread_data,
+						 0, NULL);
+
+					 return new_thread;
+}
+
+void
+joinThread_gdb( void *thread_handle) {
+}
+#endif
\ No newline at end of file