Applied evilynux patch to glade port, it seems that the port now compiles

fine so it's included in autotools scripts.
This commit is contained in:
yabause 2007-01-06 09:59:28 +00:00
parent 21a8bc42b3
commit f3e18f0457
3 changed files with 5 additions and 6 deletions

View File

@ -69,10 +69,7 @@ if test "x$HAVE_SDL" = "xyes"; then
if test "x$HAVE_LIBGLADE" = "xyes"; then if test "x$HAVE_LIBGLADE" = "xyes"; then
# libglade requires SDL too # libglade requires SDL too
UI_DIR="gtk-glade $UI_DIR"
# glade port is disabled for now as it doesn't compile
# UI_DIR="gtk-glade $UI_DIR"
UI_DIR="$UI_DIR"
fi fi
fi fi

View File

@ -2,6 +2,8 @@ bin_PROGRAMS = desmume-glade
desmume_glade_SOURCES = \ desmume_glade_SOURCES = \
callbacks.c callbacks.h callbacks_IO.c callbacks_IO.h desmume.c desmume.h \ callbacks.c callbacks.h callbacks_IO.c callbacks_IO.h desmume.c desmume.h \
globals.h keyval_names.c main.c printscreen.c \ 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_LDADD = ../libdesmume.a $(SDL_LIBS) $(LIBGLADE_LIBS)
desmume_glade_CFLAGS = $(SDL_CFLAGS) $(LIBGLADE_CFLAGS) desmume_glade_CFLAGS = $(SDL_CFLAGS) $(LIBGLADE_CFLAGS)
desmume_glade_LDFLAGS = -rdynamic

View File

@ -2,7 +2,7 @@
#include "callbacks.h" #include "callbacks.h"
#include "callbacks_IO.h" #include "callbacks_IO.h"
#include "dtools/callbacks_dtools.h" #include "dTools/callbacks_dtools.h"
#include "globals.h" #include "globals.h"
GtkWidget * pWindow; GtkWidget * pWindow;