diff --git a/Binary/x64/Dolphin.ini b/Binary/x64/Dolphin.ini index b8039c216e..fa6fc83513 100644 --- a/Binary/x64/Dolphin.ini +++ b/Binary/x64/Dolphin.ini @@ -3,51 +3,3 @@ GFXPlugin = Plugins\Plugin_VideoOGL.dll DSPPlugin = Plugins\Plugin_DSP_HLE.dll PadPlugin = Plugins\Plugin_PadSimple.dll WiiMotePlugin = Plugins\Plugin_Wiimote.dll -[General] -LastFilename = D:\Games\Gamecube\The Legend of Zelda - Wind Waker.gcz -GCMPathes = 1 -GCMPath0 = D:\Games\Gamecube -GCMPath1 = C:\Users\Shawn\Desktop -[Core] -GFXPlugin = Plugins\Plugin_VideoOGL.dll -DSPPlugin = Plugins\Plugin_DSP_NULL.dll -PadPlugin = Plugins\Plugin_PadSimple.dll -WiiMotePlugin = Plugins\Plugin_Wiimote.dll -HLEBios = True -UseDynarec = True -UseDualCore = True -SkipIdle = True -LockThreads = False -DefaultGCM = D:\Games\Gamecube\The Legend of Zelda - Wind Waker.gcz -DVDRoot = -OptimizeQuantizers = True -SelectedLanguage = 0 -RunCompareServer = False -RunCompareClient = False -[LogManager] -* = False -BOOT = False -PE = False -CP = False -VI = False -SI = False -PI = False -MI = False -DSP = False -Stream = False -DVD = False -GP = False -EXI = True -AI = False -GEKKO = False -HLE = False -DSPHLE = False -Video = False -Audio = False -DYNA = False -OSREPORT = False -CONSOLE = False -WII_IOB = False -WII_IPC = False -WII_IPC_HLE = False -WIIMOTE = False diff --git a/Externals/wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h b/Externals/wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h index ad3822ef71..dc2c7fecc6 100644 --- a/Externals/wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h +++ b/Externals/wxWidgets/lib/vc_lib/msw/wx/msw/rcdefs.h @@ -14,11 +14,7 @@ #define _WX_RCDEFS_H -#define WX_MSC_FULL_VER 150030729 - - - -#define WX_CPU_AMD64 +#define WX_MSC_FULL_VER 140050727 @@ -34,6 +30,10 @@ +#define WX_CPU_X86 + + +