Fix glade frontend build

.gitignore

@@ -29,6 +29,9 @@ Makefile.in
 /desmume/src/frontend/posix/gtk/Makefile
 /desmume/src/frontend/posix/gtk/desmume
 /desmume/src/frontend/posix/gtk/doc/Makefile
+/desmume/src/frontend/posix/gtk-glade/Makefile
+/desmume/src/frontend/posix/gtk-glade/desmume-glade
+/desmume/src/frontend/posix/gtk-glade/doc/Makefile
 /desmume/src/frontend/posix/install-sh
 
 # Xcode

desmume/src/frontend/posix/configure.ac

@@ -379,6 +379,8 @@ AC_CONFIG_FILES([Makefile
                  cli/doc/Makefile
                  gtk/Makefile
                  gtk/doc/Makefile
+                 gtk-glade/Makefile
+                 gtk-glade/doc/Makefile
 ])
 AC_OUTPUT
 

desmume/src/frontend/posix/gtk-glade/Makefile.am

@@ -1,5 +1,5 @@
 SUBDIRS = doc
-include $(top_srcdir)/src/desmume.mk
+include ../desmume.mk
 
 AM_CPPFLAGS += $(SDL_CFLAGS) $(GTKGLEXT_CFLAGS) $(LIBGLADE_CFLAGS) \
 		$(GTHREAD_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) \
@@ -27,8 +27,8 @@ desmume_glade_SOURCES =  \
 	dTools/callbacks_dtools.h \
 	dTools/dTools_display.h \
 	gdk_3Demu.cpp gdk_3Demu.h \
-	../sndsdl.h ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp \
+	../shared/sndsdl.h ../shared/sndsdl.cpp ../shared/ctrlssdl.h ../shared/ctrlssdl.cpp \
-	../driver.h ../driver.cpp
+	../../../driver.h ../../../driver.cpp
 
 desmume_glade_LDADD = ../libdesmume.a \
 			$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \

desmume/src/frontend/posix/gtk-glade/globals.h

@@ -88,8 +88,8 @@ typedef union _callback_arg{
 #include "../armcpu.h"
 #include "../NDSSystem.h"
 #include "../GPU.h"
-#include "../sndsdl.h"
+#include "../shared/sndsdl.h"
-#include "../ctrlssdl.h"
+#include "../shared/ctrlssdl.h"
 #include "../types.h"
 #include "../saves.h"
 #include "../render3D.h"

desmume/src/frontend/posix/gtk-glade/main.cpp

@@ -29,7 +29,7 @@
 #include "rasterize.h"
 #include "desmume.h"
 #include "firmware.h"
-#include "desmume_config.h"
+#include "../shared/desmume_config.h"
 
 #ifdef GDB_STUB
 #include "../armcpu.h"