More makefile work for libagg, disable libagg dependant stuff until it compiles.

desmume/configure.ac

@@ -164,7 +164,8 @@ if test "x$HAVE_ALSA" = "xno"; then
    AC_DEFINE([FAKE_MIC])
 fi
 
-AM_CONDITIONAL([HAVE_LIBAGG], [test "${HAVE_LIBAGG}" = "yes"])
+dnl - disabled until it compiles
+AM_CONDITIONAL([HAVE_LIBAGG], [test "${HAVE_LIBAGG}x" = "yes"])
 
 dnl - set conditional for glib, needed to avoid commandline.cpp compilation for cli frontend since it depends on glib
 AM_CONDITIONAL([HAVE_GLIB], [test "${FOUND_GLIB}" = "yes"])

desmume/src/Makefile.am

@@ -11,7 +11,6 @@ SUBDIRS = . $(UI_DIR)
 endif
 DIST_SUBDIRS = . gdbstub cli cocoa gtk gtk-glade windows
 noinst_LIBRARIES = libdesmume.a
-INCLUDES = -I@top_srcdir@/src/agg/include
 libdesmume_a_SOURCES = \
         armcpu.cpp armcpu.h ARM9.h \
         arm_instructions.cpp arm_instructions.h \
@@ -60,6 +59,9 @@ libdesmume_a_SOURCES += mic_alsa.cpp
 else
 libdesmume_a_SOURCES += mic.cpp
 endif
+if HAVE_LIBAGG
+libdesmume_a_SOURCES += aggdraw.cpp
+endif
 if HAVE_LUA
 libdesmume_a_SOURCES += lua-engine.cpp
 endif

desmume/src/gtk/Makefile.am

@@ -20,7 +20,7 @@ desmume_SOURCES = \
 	cheatsGTK.h cheatsGTK.cpp \
 	main.cpp main.h
 desmume_LDADD = ../libdesmume.a \
-	$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS)
+	$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS)
 if HAVE_GDB_STUB
 desmume_LDADD += ../gdbstub/libgdbstub.a
 endif