From 5fa02181045fe3392ccba48b4e0c4f3aba73b2bd Mon Sep 17 00:00:00 2001 From: riccardom Date: Mon, 18 Apr 2011 21:00:20 +0000 Subject: [PATCH] wx: fix compilation with libsoundtouch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The way we are building right now we have to link against libsoundtouch even if the frontend does not use it. Read: we have to build SPU and metaspu per frontend and not globally. From Jan Bücken, #3288648 --- desmume/src/wx/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desmume/src/wx/Makefile.am b/desmume/src/wx/Makefile.am index 6ebdb63cd..8462e1d63 100644 --- a/desmume/src/wx/Makefile.am +++ b/desmume/src/wx/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/src/desmume.mk -AM_CPPFLAGS += -DHAVE_WX=1 -DHAVE_X11=1 $(WX_CPPFLAGS) $(SDL_CFLAGS) $(LIBAGG_CFLAGS) +AM_CPPFLAGS += -DHAVE_WX=1 -DHAVE_X11=1 $(WX_CPPFLAGS) $(SDL_CFLAGS) $(LIBAGG_CFLAGS) $(LIBSOUNDTOUCH_CFLAGS) Applicationsdir = $(datadir)/applications Applications_DATA = wxdesmume.desktop @@ -27,7 +27,7 @@ wxdesmume_SOURCES = \ StringUtil.h StringUtil.cpp \ wxMain.cpp wxdesmume_LDADD = ../libdesmume.a \ - $(SDL_LIBS) $(GTHREAD_LIBS) $(GLIB_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(WX_LIBS) -lX11 + $(SDL_LIBS) $(GTHREAD_LIBS) $(GLIB_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(WX_LIBS) $(LIBSOUNDTOUCH_LIBS) -lX11 if HAVE_GDB_STUB wxdesmume_LDADD += ../gdbstub/libgdbstub.a endif