Let the wx frontend build without libagg, based on a

patch by Yar-Tour in bug #2969484.
This commit is contained in:
riccardom 2010-03-14 23:17:21 +00:00
parent fb5f523f95
commit c85a15078c
2 changed files with 6 additions and 8 deletions

View File

@ -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

View File

@ -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
#endif