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

Some configure scripts fixup for libagg, we can check for HAVE_LIBAGG for checking agg library availability.

This commit is contained in:
riccardom 2009-07-12 10:01:43 +00:00
parent 67010790e1
commit 6739397035
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/configure.ac
View File

@ -166,8 +166,10 @@ if test "x$HAVE_ALSA" = "xno"; then
AC_DEFINE([FAKE_MIC]) AC_DEFINE([FAKE_MIC])
fi fi
dnl - disabled until it compiles AM_CONDITIONAL([HAVE_LIBAGG], [test "${HAVE_LIBAGG}" = "yes"])
AM_CONDITIONAL([HAVE_LIBAGG], [test "${HAVE_LIBAGG}x" = "yes"]) if test "x$HAVE_LIBAGG" = "xyes"; then
AC_DEFINE([HAVE_LIBAGG])
fi
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"])

7
desmume/src/Makefile.am
View File

@ -19,7 +19,6 @@ libdesmume_a_SOURCES = \
debug.cpp debug.h driver.h \ debug.cpp debug.h driver.h \
Disassembler.cpp Disassembler.h \ Disassembler.cpp Disassembler.h \
dscard.h fat.h FIFO.cpp FIFO.h \ dscard.h fat.h FIFO.cpp FIFO.h \
GPU_osd.cpp GPU_osd.h \
GPU.cpp GPU.h \ GPU.cpp GPU.h \
GPU_osd.cpp GPU_osd.h \ GPU_osd.cpp GPU_osd.h \
mem.h mc.cpp mc.h \ mem.h mc.cpp mc.h \
@ -48,8 +47,8 @@ libdesmume_a_SOURCES = \
addons/compactFlash.cpp addons/gbagame.cpp addons/none.cpp addons/rumblepak.cpp addons/guitarGrip.cpp fs.h \ addons/compactFlash.cpp addons/gbagame.cpp addons/none.cpp addons/rumblepak.cpp addons/guitarGrip.cpp fs.h \
cheatSystem.cpp cheatSystem.h \ cheatSystem.cpp cheatSystem.h \
texcache.cpp texcache.h rasterize.cpp rasterize.h \ texcache.cpp texcache.h rasterize.cpp rasterize.h \
version.h \ version.h
aggdraw.cpp
if HAVE_GLIB if HAVE_GLIB
libdesmume_a_SOURCES += commandline.h commandline.cpp libdesmume_a_SOURCES += commandline.h commandline.cpp
endif endif
@ -59,7 +58,7 @@ else
libdesmume_a_SOURCES += mic.cpp libdesmume_a_SOURCES += mic.cpp
endif endif
if HAVE_LIBAGG if HAVE_LIBAGG
libdesmume_a_SOURCES += aggdraw.cpp
endif endif
if HAVE_LUA if HAVE_LUA
libdesmume_a_SOURCES += lua-engine.cpp libdesmume_a_SOURCES += lua-engine.cpp