diff --git a/desmume/configure.ac b/desmume/configure.ac index 096e0530d..3f079040f 100644 --- a/desmume/configure.ac +++ b/desmume/configure.ac @@ -69,10 +69,7 @@ if test "x$HAVE_SDL" = "xyes"; then if test "x$HAVE_LIBGLADE" = "xyes"; then # libglade requires SDL too - - # glade port is disabled for now as it doesn't compile - # UI_DIR="gtk-glade $UI_DIR" - UI_DIR="$UI_DIR" + UI_DIR="gtk-glade $UI_DIR" fi fi diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am index 6c7c490aa..799935b6d 100644 --- a/desmume/src/gtk-glade/Makefile.am +++ b/desmume/src/gtk-glade/Makefile.am @@ -2,6 +2,8 @@ bin_PROGRAMS = desmume-glade desmume_glade_SOURCES = \ callbacks.c callbacks.h callbacks_IO.c callbacks_IO.h desmume.c desmume.h \ globals.h keyval_names.c main.c printscreen.c \ - dTools/callbacks_1_ioregs.c dTools/callbacks_dtools.h + dTools/callbacks_1_ioregs.c dTools/callbacks_dtools.h \ + ../sndsdl.h ../sndsdl.c desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(LIBGLADE_LIBS) desmume_glade_CFLAGS = $(SDL_CFLAGS) $(LIBGLADE_CFLAGS) +desmume_glade_LDFLAGS = -rdynamic diff --git a/desmume/src/gtk-glade/main.c b/desmume/src/gtk-glade/main.c index a8f9d5650..21d36e785 100755 --- a/desmume/src/gtk-glade/main.c +++ b/desmume/src/gtk-glade/main.c @@ -2,7 +2,7 @@ #include "callbacks.h" #include "callbacks_IO.h" -#include "dtools/callbacks_dtools.h" +#include "dTools/callbacks_dtools.h" #include "globals.h" GtkWidget * pWindow;