diff --git a/desmume/configure.ac b/desmume/configure.ac index 99bd59643..096e0530d 100644 --- a/desmume/configure.ac +++ b/desmume/configure.ac @@ -40,7 +40,7 @@ else HAVE_SDL="no" fi -dnl - Check for GTK +dnl - Check for GTK and/or libglade AC_CHECK_TOOL(HAVE_PKG, pkg-config) if test ! "x$HAVE_PKG" = "x" ; then PKG_CHECK_MODULES(GTK, @@ -49,6 +49,13 @@ if test ! "x$HAVE_PKG" = "x" ; then HAVE_GTK=no) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) + + PKG_CHECK_MODULES(LIBGLADE, + "libglade-2.0", + HAVE_LIBGLADE=yes, + HAVE_LIBGLADE=no) + AC_SUBST(LIBGLADE_CFLAGS) + AC_SUBST(LIBGLADE_LIBS) fi dnl - Determine which UI's to build @@ -59,6 +66,14 @@ if test "x$HAVE_SDL" = "xyes"; then # GTK requires SDL UI_DIR="gtk $UI_DIR" fi + + 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" + fi fi case $target in @@ -110,6 +125,7 @@ AC_CONFIG_FILES([Makefile src/Makefile src/cli/Makefile src/gtk/Makefile + src/gtk-glade/Makefile src/windows/Makefile autopackage/default.apspec ]) diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am new file mode 100644 index 000000000..123865ce2 --- /dev/null +++ b/desmume/src/gtk-glade/Makefile.am @@ -0,0 +1,4 @@ +bin_PROGRAMS = desmume-glade +desmume_glade_SOURCES = callbacks.c callbacks.h callbacks_IO.c callbacks_IO.h desmume.c desmume.h globals.h interface.c keyval_names.c main.c printscreen.c +desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(LIBGLADE_LIBS) +desmume_glade_CFLAGS = $(SDL_CFLAGS) $(LIBGLADE_CFLAGS) diff --git a/desmume/src/gtk-glade/callbacks.h b/desmume/src/gtk-glade/callbacks.h index cd3617c08..c71b37b89 100755 --- a/desmume/src/gtk-glade/callbacks.h +++ b/desmume/src/gtk-glade/callbacks.h @@ -58,3 +58,4 @@ void on_wc_2b_BG1_toggled (GtkToggleButton *togglebutton, gpointer user_data); void on_wc_2b_BG2_toggled (GtkToggleButton *togglebutton, gpointer user_data); void on_wc_2b_BG3_toggled (GtkToggleButton *togglebutton, gpointer user_data); void on_wc_2b_BG4_toggled (GtkToggleButton *togglebutton, gpointer user_data); +void on_wc_2b_OBJ_toggled (GtkToggleButton *togglebutton, gpointer user_data);