From 1cf0998d34558144d7601e06a9dd290c2ae08cca Mon Sep 17 00:00:00 2001 From: riccardom Date: Sat, 11 Jul 2009 17:48:24 +0000 Subject: [PATCH] Add libagg detection machinery. --- desmume/configure.ac | 6 ++++++ desmume/src/Makefile.am | 8 +------- desmume/src/cli/Makefile.am | 4 ++-- desmume/src/gtk-glade/Makefile.am | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/desmume/configure.ac b/desmume/configure.ac index 3f56a28f8..06cc21719 100644 --- a/desmume/configure.ac +++ b/desmume/configure.ac @@ -147,6 +147,10 @@ AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [ PKG_CHECK_MODULES(ALSA, alsa >= 1.0, HAVE_ALSA=yes, HAVE_ALSA=no) AC_SUBST(ALSA_CFLAGS) AC_SUBST(ALSA_LIBS) + + PKG_CHECK_MODULES(LIBAGG, libagg >= 2.5.0, HAVE_LIBAGG=yes, HAVE_LIBAGG=no) + AC_SUBST(LIBAGG_CFLAGS) + AC_SUBST(LIBAGG_LIBS) fi ],[ echo "WARNING: pkg-config is not available therefore gtk, gtk-glade UIs and lua scripting are not available either." @@ -160,6 +164,8 @@ if test "x$HAVE_ALSA" = "xno"; then AC_DEFINE([FAKE_MIC]) fi +AM_CONDITIONAL([HAVE_LIBAGG], [test "${HAVE_LIBAGG}" = "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"]) diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am index 50e66e661..6a5e797fc 100644 --- a/desmume/src/Makefile.am +++ b/desmume/src/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/src/desmume.mk -AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(LUA_CFLAGS) $(ALSA_CFLAGS) +AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(LUA_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp \ matrix_sse2-x64.asm matrix_sse2-x86.asm @@ -49,12 +49,6 @@ libdesmume_a_SOURCES = \ utils/decrypt/decrypt.h utils/decrypt/header.cpp utils/decrypt/header.h \ addons.cpp addons.h \ addons/compactFlash.cpp addons/gbagame.cpp addons/none.cpp addons/rumblepak.cpp addons/guitarGrip.cpp fs.h \ - agg/src/agg_arc.cpp agg/src/agg_arrowhead.cpp agg/src/agg_bezier_arc.cpp agg/src/agg_bspline.cpp agg/src/agg_curves.cpp \ - agg/src/agg_embedded_raster_fonts.cpp agg/src/agg_gsv_text.cpp agg/src/agg_image_filters.cpp agg/src/agg_line_aa_basics.cpp agg/src/agg_line_profile_aa.cpp \ - agg/src/agg_rounded_rect.cpp agg/src/agg_sqrt_tables.cpp \ - agg/src/agg_trans_affine.cpp agg/src/agg_trans_double_path.cpp agg/src/agg_trans_single_path.cpp agg/src/agg_trans_warp_magnifier.cpp \ - agg/src/agg_vcgen_bspline.cpp agg/src/agg_vcgen_contour.cpp agg/src/agg_vcgen_dash.cpp agg/src/agg_vcgen_markers_term.cpp agg/src/agg_vcgen_smooth_poly1.cpp agg/src/agg_vcgen_stroke.cpp \ - agg/src/agg_vpgen_clip_polygon.cpp agg/src/agg_vpgen_clip_polyline.cpp agg/src/agg_vpgen_segmentator \ cheatSystem.cpp cheatSystem.h \ texcache.cpp texcache.h rasterize.cpp rasterize.h \ version.h diff --git a/desmume/src/cli/Makefile.am b/desmume/src/cli/Makefile.am index ff83f9119..16f37f90a 100644 --- a/desmume/src/cli/Makefile.am +++ b/desmume/src/cli/Makefile.am @@ -1,11 +1,11 @@ SUBDIRS = doc include $(top_srcdir)/src/desmume.mk -AM_CFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) +AM_CFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) bin_PROGRAMS = desmume-cli desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp -desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) +desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) if HAVE_GDB_STUB desmume_cli_LDADD += ../gdbstub/libgdbstub.a endif diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am index 41a09f631..89ea3b516 100644 --- a/desmume/src/gtk-glade/Makefile.am +++ b/desmume/src/gtk-glade/Makefile.am @@ -30,7 +30,7 @@ desmume_glade_SOURCES = \ desmume_glade_LDADD = ../libdesmume.a \ $(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \ - $(GTHREAD_LIBS) $(ALSA_LIBS) + $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) if HAVE_GDB_STUB desmume_glade_LDADD += ../gdbstub/libgdbstub.a endif