Add alsa cflags / libs to makefiles.
This commit is contained in:
parent
ba33e8aa6b
commit
fbc2d8e296
|
@ -1,6 +1,6 @@
|
||||||
include $(top_srcdir)/src/desmume.mk
|
include $(top_srcdir)/src/desmume.mk
|
||||||
|
|
||||||
AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(LUA_CFLAGS)
|
AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(LUA_CFLAGS) $(ALSA_CFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp \
|
EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp \
|
||||||
matrix_sse2-x64.asm matrix_sse2-x86.asm
|
matrix_sse2-x64.asm matrix_sse2-x86.asm
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
SUBDIRS = doc
|
SUBDIRS = doc
|
||||||
include $(top_srcdir)/src/desmume.mk
|
include $(top_srcdir)/src/desmume.mk
|
||||||
|
|
||||||
AM_CFLAGS += $(SDL_CFLAGS)
|
AM_CFLAGS += $(SDL_CFLAGS) $(ALSA_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)
|
desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS)
|
||||||
if HAVE_GDB_STUB
|
if HAVE_GDB_STUB
|
||||||
desmume_cli_LDADD += ../gdbstub/libgdbstub.a
|
desmume_cli_LDADD += ../gdbstub/libgdbstub.a
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -2,7 +2,7 @@ SUBDIRS = doc
|
||||||
include $(top_srcdir)/src/desmume.mk
|
include $(top_srcdir)/src/desmume.mk
|
||||||
|
|
||||||
AM_CPPFLAGS += $(SDL_CFLAGS) $(GTKGLEXT_CFLAGS) $(LIBGLADE_CFLAGS) \
|
AM_CPPFLAGS += $(SDL_CFLAGS) $(GTKGLEXT_CFLAGS) $(LIBGLADE_CFLAGS) \
|
||||||
$(GTHREAD_CFLAGS) -DDATADIR=\"$(gladedir)/\" \
|
$(GTHREAD_CFLAGS) $(ALSA_CFLAGS) -DDATADIR=\"$(gladedir)/\" \
|
||||||
-DLOCALEDIR=\"$(localedir)\"
|
-DLOCALEDIR=\"$(localedir)\"
|
||||||
AM_LDFLAGS += -rdynamic $(INTLLIBS)
|
AM_LDFLAGS += -rdynamic $(INTLLIBS)
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ desmume_glade_SOURCES = \
|
||||||
|
|
||||||
desmume_glade_LDADD = ../libdesmume.a \
|
desmume_glade_LDADD = ../libdesmume.a \
|
||||||
$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \
|
$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \
|
||||||
$(GTHREAD_LIBS)
|
$(GTHREAD_LIBS) $(ALSA_LIBS)
|
||||||
if HAVE_GDB_STUB
|
if HAVE_GDB_STUB
|
||||||
desmume_glade_LDADD += ../gdbstub/libgdbstub.a
|
desmume_glade_LDADD += ../gdbstub/libgdbstub.a
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
SUBDIRS = doc
|
SUBDIRS = doc
|
||||||
include $(top_srcdir)/src/desmume.mk
|
include $(top_srcdir)/src/desmume.mk
|
||||||
|
|
||||||
AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS)
|
AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(ALSA_CFLAGS)
|
||||||
|
|
||||||
Applicationsdir = $(datadir)/applications
|
Applicationsdir = $(datadir)/applications
|
||||||
Applications_DATA = desmume.desktop
|
Applications_DATA = desmume.desktop
|
||||||
|
@ -12,7 +12,7 @@ bin_PROGRAMS = desmume
|
||||||
desmume_SOURCES = \
|
desmume_SOURCES = \
|
||||||
desmume.h desmume.cpp \
|
desmume.h desmume.cpp \
|
||||||
dTool.h dToolsList.cpp \
|
dTool.h dToolsList.cpp \
|
||||||
tools/ioregsView.cpp tools/ioregsView.h \
|
tools/ioregsView.cpp tools/ioregsView.h tools/memoryView.cpp \
|
||||||
../sndsdl.cpp \
|
../sndsdl.cpp \
|
||||||
../ctrlssdl.h ../ctrlssdl.cpp \
|
../ctrlssdl.h ../ctrlssdl.cpp \
|
||||||
osmesa_3Demu.cpp osmesa_3Demu.h \
|
osmesa_3Demu.cpp osmesa_3Demu.h \
|
||||||
|
@ -20,7 +20,7 @@ desmume_SOURCES = \
|
||||||
cheatsGTK.h cheatsGTK.cpp \
|
cheatsGTK.h cheatsGTK.cpp \
|
||||||
main.cpp main.h
|
main.cpp main.h
|
||||||
desmume_LDADD = ../libdesmume.a \
|
desmume_LDADD = ../libdesmume.a \
|
||||||
$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS)
|
$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS)
|
||||||
if HAVE_GDB_STUB
|
if HAVE_GDB_STUB
|
||||||
desmume_LDADD += ../gdbstub/libgdbstub.a
|
desmume_LDADD += ../gdbstub/libgdbstub.a
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue