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

Make glib mandatory for all frontends.

This commit is contained in:
riccardom 2009-07-28 20:36:53 +00:00
parent 74e0fabca9
commit ffeb6b97f0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/configure.ac
View File

@ -173,8 +173,10 @@ else
AC_MSG_ERROR([Antigrain library is required to build desmume]) AC_MSG_ERROR([Antigrain library is required to build desmume])
fi fi
dnl - set conditional for glib, needed to avoid commandline.cpp compilation for cli frontend since it depends on glib dnl - depends on glib, reference pkg-config since it is needed for checking glib
AM_CONDITIONAL([HAVE_GLIB], [test "${FOUND_GLIB}" = "yes"]) if test "x$FOUND_GLIB" = "xno"; then
AC_MSG_ERROR([Glib and pkg-config are required to build desmume])
fi
dnl - If the gtkGLext package is available define the corresponding C macro dnl - If the gtkGLext package is available define the corresponding C macro
if test "x$HAVE_GTKGLEXT" = "xyes"; then if test "x$HAVE_GTKGLEXT" = "xyes"; then

4
desmume/src/Makefile.am
View File

@ -14,6 +14,7 @@ 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 \
bios.cpp bios.h bits.h cp15.cpp cp15.h \ bios.cpp bios.h bits.h cp15.cpp cp15.h \
commandline.h commandline.cpp \
common.cpp common.h \ common.cpp common.h \
debug.cpp debug.h driver.h \ debug.cpp debug.h driver.h \
Disassembler.cpp Disassembler.h \ Disassembler.cpp Disassembler.h \
@ -49,9 +50,6 @@ libdesmume_a_SOURCES = \
texcache.cpp texcache.h rasterize.cpp rasterize.h \ texcache.cpp texcache.h rasterize.cpp rasterize.h \
version.h version.h
if HAVE_GLIB
libdesmume_a_SOURCES += commandline.h commandline.cpp
endif
if HAVE_ALSA if HAVE_ALSA
libdesmume_a_SOURCES += mic_alsa.cpp libdesmume_a_SOURCES += mic_alsa.cpp
else else

4
desmume/src/cli/Makefile.am
View File

@ -1,11 +1,11 @@
SUBDIRS = doc SUBDIRS = doc
include $(top_srcdir)/src/desmume.mk include $(top_srcdir)/src/desmume.mk
AM_CPPFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) AM_CPPFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(GLIB_CFLAGS)
bin_PROGRAMS = desmume-cli bin_PROGRAMS = desmume-cli
desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp
desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS)
if HAVE_GDB_STUB if HAVE_GDB_STUB
desmume_cli_LDADD += ../gdbstub/libgdbstub.a desmume_cli_LDADD += ../gdbstub/libgdbstub.a
endif endif