diff --git a/Makefile b/Makefile index 6a1967aace..2e680f0da0 100644 --- a/Makefile +++ b/Makefile @@ -48,8 +48,11 @@ ifeq ($(HAVE_OSS), 1) endif ifeq ($(HAVE_OSS_BSD), 1) OBJ += audio/oss.o +endif +ifeq ($(HAVE_OSS_LIB), 1) LIBS += -lossaudio endif + ifeq ($(HAVE_ALSA), 1) OBJ += audio/alsa.o LIBS += -lasound diff --git a/qb/config.libs.sh b/qb/config.libs.sh index f78ad11852..d0810c59b8 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -29,10 +29,6 @@ check_header OSS sys/soundcard.h check_header OSS_BSD soundcard.h check_lib OSS_LIB -lossaudio -if [ "$HAVE_OSS_BSD" = "yes" ]; then - check_critical OSS_LIB "Have BSD-style OSS, but -lossaudio is not present." -fi - if [ "$OS" = "Darwin" ]; then check_lib AL "-framework OpenAL" alcOpenDevice else @@ -78,7 +74,7 @@ check_lib STRL -lc strlcpy check_pkgconf PYTHON python3 # Creates config.mk and config.h. -VARS="ALSA OSS OSS_BSD AL RSOUND ROAR JACK PULSE SDL DYLIB CG XML SDL_IMAGE DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE SRC CONFIGFILE FREETYPE XVIDEO NETPLAY FBO STRL PYTHON" +VARS="ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK PULSE SDL DYLIB CG XML SDL_IMAGE DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE SRC CONFIGFILE FREETYPE XVIDEO NETPLAY FBO STRL PYTHON" create_config_make config.mk $VARS create_config_header config.h $VARS