diff --git a/desmume/src/windows/wx/include/wx/setup.h b/desmume/src/windows/wx/include/wx/setup.h
index 18b035a97..1f2baa48c 100644
--- a/desmume/src/windows/wx/include/wx/setup.h
+++ b/desmume/src/windows/wx/include/wx/setup.h
@@ -394,7 +394,7 @@
// See also wxUSE_CONFIG_NATIVE below.
//
// Recommended setting: 1
-#define wxUSE_CONFIG 1 // Luigi__ - setting this to 0 breaks Windows WX, duh
+#define wxUSE_CONFIG 1 //zero 23-jun-2010 (decided we wanted this)
// If wxUSE_CONFIG is 1, you may choose to use either the native config
// classes under Windows (using .INI files under Win16 and the registry under
diff --git a/desmume/src/windows/wx/wx.7z b/desmume/src/windows/wx/wx.7z
index d37f823c3..a8f3e95a4 100644
Binary files a/desmume/src/windows/wx/wx.7z and b/desmume/src/windows/wx/wx.7z differ
diff --git a/desmume/src/wx/wxDeSmuME_2008.vcproj b/desmume/src/wx/wxDeSmuME_2008.vcproj
index 122830d45..99e03fa81 100644
--- a/desmume/src/wx/wxDeSmuME_2008.vcproj
+++ b/desmume/src/wx/wxDeSmuME_2008.vcproj
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
@@ -1377,6 +1365,16 @@
Outputs=".libs\7z.tag"
/>
+
+
+
@@ -1387,6 +1385,16 @@
Outputs=".libs\7z.tag"
/>
+
+
+
@@ -1411,26 +1419,6 @@
Outputs=".libs\directx.tag"
/>
-
-
-
-
-
-
@@ -1441,6 +1429,16 @@
Outputs=".libs\directx.tag"
/>
+
+
+
@@ -1451,6 +1449,16 @@
Outputs=".libs\directx.tag"
/>
+
+
+
@@ -1475,26 +1483,6 @@
Outputs=".libs\glib-vc8.tag"
/>
-
-
-
-
-
-
@@ -1505,6 +1493,16 @@
Outputs=".libs\glib-vc8.tag"
/>
+
+
+
@@ -1515,6 +1513,16 @@
Outputs=".libs\glib-vc8.tag"
/>
+
+
+
@@ -1539,26 +1547,6 @@
Outputs=".libs\lua.tag"
/>
-
-
-
-
-
-
@@ -1569,6 +1557,16 @@
Outputs=".libs\lua.tag"
/>
+
+
+
@@ -1579,6 +1577,16 @@
Outputs=".libs\lua.tag"
/>
+
+
+
@@ -1603,26 +1611,6 @@
Outputs=".libs\wx.tag"
/>
-
-
-
-
-
-
@@ -1633,6 +1621,16 @@
Outputs=".libs\wx.tag"
/>
+
+
+
@@ -1643,6 +1641,16 @@
Outputs=".libs\wx.tag"
/>
+
+
+
diff --git a/desmume/src/wx/wxMain.cpp b/desmume/src/wx/wxMain.cpp
index d487b15f1..b6025a10a 100644
--- a/desmume/src/wx/wxMain.cpp
+++ b/desmume/src/wx/wxMain.cpp
@@ -1,10 +1,3 @@
-#ifdef WIN32
-#pragma comment(lib,"wxmsw28_core.lib")
-#pragma comment(lib,"wxbase28.lib")
-#else
-#define lstrlen(a) strlen((a))
-#endif
-
#include "NDSSystem.h"
#include "GPU_osd.h"
#include
@@ -19,6 +12,28 @@
#include "OGLRender.h"
#include "firmware.h"
+#ifdef WIN32
+#ifdef _M_X64
+ #ifndef NDEBUG
+ #pragma comment(lib,"wxmsw28d_core-x64.lib")
+ #pragma comment(lib,"wxbase28d-x64.lib")
+ #else
+ #pragma comment(lib,"wxmsw28_core-x64.lib")
+ #pragma comment(lib,"wxbase28-x64.lib")
+ #endif
+#else
+ #ifndef NDEBUG
+ #pragma comment(lib,"wxmsw28d_core.lib")
+ #pragma comment(lib,"wxbase28d.lib")
+ #else
+ #pragma comment(lib,"wxmsw28_core.lib")
+ #pragma comment(lib,"wxbase28.lib")
+ #endif
+#endif
+#else
+#define lstrlen(a) strlen((a))
+#endif
+
#ifdef WIN32
#include "snddx.h"
#endif