diff options
| author | Andre Heider | 2010-08-28 12:51:12 +0000 |
|---|---|---|
| committer | Andre Heider | 2010-08-28 12:51:12 +0000 |
| commit | 80b9e8371b3cb8ef07df3495f8569271f8088211 (patch) | |
| tree | 194d26afb0dd18aae730892e9e7c7567069a45e2 /backends/platform/wii/main.cpp | |
| parent | c45b3e4e0e66ae56d06dcf1215477cf77eecc375 (diff) | |
| download | scummvm-rg350-80b9e8371b3cb8ef07df3495f8569271f8088211.tar.gz scummvm-rg350-80b9e8371b3cb8ef07df3495f8569271f8088211.tar.bz2 scummvm-rg350-80b9e8371b3cb8ef07df3495f8569271f8088211.zip | |
WII: svn merge Wii port commits from trunk
svn-id: r52425
Diffstat (limited to 'backends/platform/wii/main.cpp')
| -rw-r--r-- | backends/platform/wii/main.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp index 627cc7d1db..7f141f2339 100644 --- a/backends/platform/wii/main.cpp +++ b/backends/platform/wii/main.cpp @@ -37,8 +37,7 @@ #ifdef DEBUG_WII_GDB #include <debug.h> #endif -#include <gfx/gfx.h> -#include <gfx/gfx_con.h> +#include <gxflux/gfx_con.h> #ifdef __cplusplus extern "C" { @@ -51,7 +50,6 @@ void reset_cb(void) { #ifdef DEBUG_WII_GDB printf("attach gdb now\n"); _break(); - SYS_SetResetCallback(reset_cb); #else reset_btn_pressed = true; #endif @@ -78,6 +76,11 @@ static void show_console(int code) { for (i = 0; i < 60 * 3; ++i) VIDEO_WaitVSync(); +#ifdef DEBUG_WII_GDB + printf("attach gdb now\n"); + _break(); +#endif + printf("Press any key to continue.\n"); if (!gfx_frame_start()) @@ -157,12 +160,13 @@ void wii_memstats(void) { int main(int argc, char *argv[]) { s32 res; -#ifdef USE_WII_DI +#if defined(USE_WII_DI) && !defined(GAMECUBE) DI_Init(); #endif VIDEO_Init(); PAD_Init(); + DSP_Init(); AUDIO_Init(NULL); gfx_video_init(NULL); |