diff --git a/360/main.c b/360/main.c
index 37b811eeea..29200bdadc 100644
--- a/360/main.c
+++ b/360/main.c
@@ -151,18 +151,18 @@ int main(int argc, char *argv[])
config_set_defaults();
- g_console->mode_switch = MODE_MENU;
+ g_console.mode_switch = MODE_MENU;
xdk360_video_init();
menu_init();
begin_loop:
- if(g_console->mode_switch == MODE_EMULATION)
+ if(g_console.mode_switch == MODE_EMULATION)
{
while(ssnes_main_iterate());
}
- else if(g_console->mode_switch == MODE_MENU)
+ else if(g_console.mode_switch == MODE_MENU)
{
menu_loop();
diff --git a/360/menu.cpp b/360/menu.cpp
index bdea38dc9b..f751194f1a 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -87,8 +87,8 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
if ( hObjPressed == m_filebrowser )
{
- g_console->menu_enable = false;
- g_console->mode_switch = MODE_EMULATION;
+ g_console.menu_enable = false;
+ g_console.mode_switch = MODE_EMULATION;
init_ssnes = 1;
}
else if ( hObjPressed == m_settings )
@@ -105,8 +105,8 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
}
else if ( hObjPressed == m_quit )
{
- g_console->menu_enable = false;
- g_console->mode_switch = MODE_EXIT;
+ g_console.menu_enable = false;
+ g_console.mode_switch = MODE_EXIT;
init_ssnes = 0;
}
@@ -157,7 +157,7 @@ int menu_init (void)
void menu_loop(void)
{
- g_console->menu_enable = true;
+ g_console.menu_enable = true;
HRESULT hr;
xdk360_video_t *vid = (xdk360_video_t*)g_d3d;
@@ -174,5 +174,5 @@ void menu_loop(void)
/* Present the frame */
vid->xdk360_render_device->Present(NULL, NULL, NULL, NULL);
- }while(g_console->menu_enable);
+ }while(g_console.menu_enable);
}
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index 3479dda2e7..e737265f7f 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -106,7 +106,7 @@
true
false
MultiThreadedDebug
- _DEBUG;_XBOX;PACKAGE_VERSION="0.9.4.1";%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;main=ssnes_main;HAVE_CONFIGFILE;HAVE_NETPLAY;HAVE_SOCKET_LEGACY
+ _DEBUG;_XBOX;PACKAGE_VERSION="0.9.4.1";%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;main=ssnes_main;SSNES_CONSOLE;HAVE_CONFIGFILE;HAVE_NETPLAY;HAVE_SOCKET_LEGACY
Callcap
@@ -157,7 +157,7 @@
Size
false
MultiThreaded
- NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.4.1";_CRT_SECURE_NO_WARNINGS;main=ssnes_main;HAVE_CONFIGFILE
+ NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.4.1";_CRT_SECURE_NO_WARNINGS;SSNES_CONSOLE;main=ssnes_main;HAVE_CONFIGFILE
Callcap
@@ -216,7 +216,7 @@
false
false
MultiThreaded
- NDEBUG;_XBOX;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.4.1";_CRT_SECURE_NO_WARNINGS;main=ssnes_main;HAVE_CONFIGFILE;HAVE_NETPLAY;HAVE_SOCKET_LEGACY
+ NDEBUG;_XBOX;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.4.1";_CRT_SECURE_NO_WARNINGS;main=ssnes_main;SSNES_CONSOLE=1;HAVE_CONFIGFILE;HAVE_NETPLAY;HAVE_SOCKET_LEGACY
true
@@ -244,7 +244,7 @@
false
false
MultiThreaded
- NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.4.1";_CRT_SECURE_NO_WARNINGS;main=ssnes_main;HAVE_CONFIGFILE
+ NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.4.1";_CRT_SECURE_NO_WARNINGS;SSNES_CONSOLE;main=ssnes_main;HAVE_CONFIGFILE
true