diff --git a/desmume/configure.ac b/desmume/configure.ac index 2b4278605..4f34e39fc 100644 --- a/desmume/configure.ac +++ b/desmume/configure.ac @@ -231,18 +231,12 @@ AM_CONDITIONAL([HAVE_WX], [test "x$wxwidgets" = "xyes"]) dnl - Determine which UIs to build and if po/ should be included PO_DIR="" if test "x$HAVE_SDL" = "xyes"; then - # SDL adds just a cli UI_DIR="cli $UI_DIR" if test "x$HAVE_GTK" = "xyes"; then - # GTK requires SDL UI_DIR="gtk $UI_DIR" fi if test "x$wxwin" = "xyes"; then - if test "x$HAVE_LIBAGG" = "xyes"; then - UI_DIR="wx $UI_DIR" - else - AC_MSG_WARN([Antigrain library not found, wxWidgets frontend will be disabled]) - fi + UI_DIR="wx $UI_DIR" fi if test "x$HAVE_LIBGLADE" = "xyes"; then diff --git a/desmume/src/wx/wxMain.cpp b/desmume/src/wx/wxMain.cpp index 1ecef7e9e..4b999504c 100644 --- a/desmume/src/wx/wxMain.cpp +++ b/desmume/src/wx/wxMain.cpp @@ -285,7 +285,9 @@ public: void closeRom(wxCommandEvent& event) { NDS_FreeROM(); execute = false; +#ifdef HAVE_LIBAGG Hud.resetTransient(); +#endif NDS_Reset(); } @@ -483,8 +485,10 @@ bool Desmume::OnInit() DesmumeFrame *frame = new DesmumeFrame(emu_version); frame->NDSInitialize(); +#ifdef HAVE_LIBAGG Desmume_InitOnce(); aggDraw.hud->attach((u8*)GPU_screen, 256, 384, 1024);//TODO +#endif NDS_3D_ChangeCore(0); @@ -624,4 +628,4 @@ createThread_gdb( void (APIENTRY *thread_function)( void *data), void joinThread_gdb( void *thread_handle) { } -#endif \ No newline at end of file +#endif