diff options
| author | IOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at> | 2017-10-10 14:28:37 +0200 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at> | 2017-10-10 14:28:37 +0200 |
| commit | 59c91ece11f4c3b5aa0f21398e6dcb441e7e0e52 (patch) | |
| tree | a27c2f6161d5e055583ef299c72a85eef32e80eb | |
| parent | 4543e0a2ca986111f64b62871197662dcae32e21 (diff) | |
Conditionally build asio sources
afaict, the current code wouldn't work at all (defining an unused 'objects'
Makefile-variable).
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d4fa538..94c8c49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,14 @@ lib_LTLIBRARIES = %D%/librtaudio.la %D%/RtAudio.cpp \ %D%/rtaudio_c.cpp +if ASIO +%C%_librtaudio_la_SOURCES += \ + asio.cpp \ + asiodrivers.cpp \ + asiolist.cpp \ + iasiothiscallresolver.cpp +endif + rtaudio_incdir = $(includedir)/rtaudio rtaudio_inc_HEADERS = \ %D%/RtAudio.h \ diff --git a/configure.ac b/configure.ac index b8ba18d..0bdec71 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,8 @@ AC_SUBST(req) api="" req="" +use_asio="" + # configure flags AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],[enable various debug output])]) @@ -235,7 +237,7 @@ AS_CASE([$host], AS_IF([test "x$with_asio" = "xyes" ], [ AC_MSG_RESULT(using ASIO) api="$api -D__WINDOWS_ASIO__" - AC_SUBST( objects, ["asio.o asiodrivers.o asiolist.o iasiothiscallresolver.o"] ) + use_asio=yes ]) # Look for DirectSound flag AS_IF([test "x$with_ds" = "xyes" ], [ @@ -262,6 +264,8 @@ AS_CASE([$host], ] ) +AM_CONDITIONAL( ASIO, [test "x${use_asio}" = "xyes" ]) + CPPFLAGS="$CPPFLAGS $api" AC_OUTPUT |