ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
riccardom 2009-07-11 18:45:54 +00:00
parent 0b9b7dab23
commit 3307f91dcf
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
desmume/configure.ac
View File

@ -164,7 +164,8 @@ if test "x$HAVE_ALSA" = "xno"; then
AC_DEFINE([FAKE_MIC]) AC_DEFINE([FAKE_MIC])
fi 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 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"]) AM_CONDITIONAL([HAVE_GLIB], [test "${FOUND_GLIB}" = "yes"])

4
desmume/src/Makefile.am
View File

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

2
desmume/src/gtk/Makefile.am
View File

@ -20,7 +20,7 @@ desmume_SOURCES = \
cheatsGTK.h cheatsGTK.cpp \ cheatsGTK.h cheatsGTK.cpp \
main.cpp main.h main.cpp main.h
desmume_LDADD = ../libdesmume.a \ 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 if HAVE_GDB_STUB
desmume_LDADD += ../gdbstub/libgdbstub.a desmume_LDADD += ../gdbstub/libgdbstub.a
endif endif