1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
|
Description: Build with system opusfile/speexdsp
Author: Stephen Kitt <skitt@debian.org>
Forwarded: not-needed
--- a/configure.ac
+++ b/configure.ac
@@ -1379,6 +1379,8 @@
AM_CONDITIONAL(MACOS_UNIVERSAL, [ test x$enable_universal = xyes ])
+LIBS="$LIBS -lopusfile -lspeexdsp"
+
AC_CONFIG_FILES([
Makefile
src/Makefile
@@ -1403,7 +1405,6 @@
src/libs/passthroughio/Makefile
src/libs/mt32/Makefile
src/libs/xBRZ/Makefile
-src/libs/decoders/internal/Makefile
src/output/Makefile
src/output/direct3d/Makefile
src/builtin/Makefile
--- a/src/libs/Makefile.am
+++ b/src/libs/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
-SUBDIRS = zmbv gui_tk passthroughio mt32 decoders/internal
+SUBDIRS = zmbv gui_tk passthroughio mt32
if C_XBRZ
SUBDIRS += xBRZ
--- a/src/dos/Makefile.am
+++ b/src/dos/Makefile.am
@@ -1,4 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+AM_CPPFLAGS += -I/usr/include/opus
noinst_LIBRARIES = libdos.a
EXTRA_DIST = scsidefs.h wnaspi32.h dos_codepages.h dos_keyboard_layout_data.h
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@
ints/libints.a hardware/serialport/libserial.a hardware/parport/libparallel.a \
libs/passthroughio/libpassthroughio.a gui/libgui.a libs/gui_tk/libgui_tk.a hardware/libhardware.a \
cpu/libcpu.a hardware/reSID/libresid.a fpu/libfpu.a gui/libgui.a \
- misc/libmisc.a output/liboutput.a hardware/mame/libmame.a libs/zmbv/libzmbv.a libs/decoders/internal/libopusint.a
+ misc/libmisc.a output/liboutput.a hardware/mame/libmame.a libs/zmbv/libzmbv.a
if OS2
dosbox_x_LDADD += os2res.res
|