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

wx: fix compilation with libsoundtouch 

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
This commit is contained in:
riccardom 2011-04-18 21:00:20 +00:00
parent dd351a80b9
commit 5fa0218104
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
include $(top_srcdir)/src/desmume.mk 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 Applicationsdir = $(datadir)/applications
Applications_DATA = wxdesmume.desktop Applications_DATA = wxdesmume.desktop
@ -27,7 +27,7 @@ wxdesmume_SOURCES = \
StringUtil.h StringUtil.cpp \ StringUtil.h StringUtil.cpp \
wxMain.cpp wxMain.cpp
wxdesmume_LDADD = ../libdesmume.a \ 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 if HAVE_GDB_STUB
wxdesmume_LDADD += ../gdbstub/libgdbstub.a wxdesmume_LDADD += ../gdbstub/libgdbstub.a
endif endif