From bb07192c94662a58e29ac6bfeb2f2efd2c065475 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 3 Mar 2020 07:58:17 +0100 Subject: [PATCH] Coreaudio: add LIBS and OBJS in a usual way --- Makefile.in | 3 +-- configure.ac | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index b85f23a8b..2b4c3ff17 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,7 @@ CXXFLAGS = @CXXFLAGS@ $(COMMON_FLAGS) -D_GNU_SOURCE MKDIR_P = mkdir -p CUDA_FLAGS = @CUDA_FLAGS@ @CUDA_COMPUTE_ARGS@ LDFLAGS = @LDFLAGS@ -LIBS += @LIBS@ @MATHLIBS@ @COREAUDIO_LIB@ -lm -pthread +LIBS += @LIBS@ @MATHLIBS@ -lm -pthread INC = -Isrc -I$(srcdir) -I$(srcdir)/src -I$(srcdir)/test -Idxt_compress \ @JACK_TRANS_INC@ @SPEEX_INC@ \ @CUDA_INC@ @INC@ @@ -94,7 +94,6 @@ COMMON_OBJS = \ src/audio/types.o \ src/audio/utils.o \ src/audio/wav_reader.o \ - @COREAUDIO_OBJ@ \ @JACK_TRANS_OBJ@ \ @SPEEX_OBJ@ \ src/capture_filter.o \ diff --git a/configure.ac b/configure.ac index 9f15a39d8..bf54535ad 100644 --- a/configure.ac +++ b/configure.ac @@ -2543,6 +2543,7 @@ case $host_os in COREAUDIO_OBJ="src/audio/capture/coreaudio.o src/audio/playback/coreaudio.o" coreaudio=yes AC_DEFINE([HAVE_COREAUDIO], [1], [Build with CoreAudio support]) + ADD_MODULE("", "$COREAUDIO_OBJ", "$COREAUDIO_LIB") fi ;; esac @@ -2558,10 +2559,6 @@ if test $coreaudio_req = yes -a $coreaudio = no; then AC_MSG_ERROR([Core Audio not found]); fi -AC_SUBST(COREAUDIO_LIB) -AC_SUBST(COREAUDIO_OBJ) - - # ------------------------------------------------------------------------------------------------- # Scale Stuff # -------------------------------------------------------------------------------------------------