Skip to content
Snippets Groups Projects
Commit 292479e1 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Don't leave portaudio and pulseaudio enabled for Win32

Also, include WaveOut in the audio build options.
parent 54ae4f9a
Branches
Tags
No related merge requests found
Pipeline #8819 passed
...@@ -3983,6 +3983,7 @@ show_bbslist(char *current, int connected) ...@@ -3983,6 +3983,7 @@ show_bbslist(char *current, int connected)
" %s OSS\n" " %s OSS\n"
" %s SDL\n" " %s SDL\n"
" %s ALSA\n" " %s ALSA\n"
" %s WaveOut\n"
" %s PortAudio\n" " %s PortAudio\n"
" %s PulseAudio\n", " %s PulseAudio\n",
#ifdef WITHOUT_CRYPTLIB #ifdef WITHOUT_CRYPTLIB
...@@ -4045,6 +4046,11 @@ show_bbslist(char *current, int connected) ...@@ -4045,6 +4046,11 @@ show_bbslist(char *current, int connected)
#else #else
"[ ]", "[ ]",
#endif #endif
#ifdef _WIN32
"[`\xFB`]",
#else
"[ ]",
#endif
#ifdef WITH_PORTAUDIO #ifdef WITH_PORTAUDIO
"[`\xFB`]", "[`\xFB`]",
#else #else
......
...@@ -205,6 +205,7 @@ endif ...@@ -205,6 +205,7 @@ endif
ifndef WITHOUT_PORTAUDIO ifndef WITHOUT_PORTAUDIO
PORTAUDIO_PATH ?= $(shell if [ -f /usr/local/include/portaudio.h ]; then echo /usr/local ; elif [ -f /usr/include/portaudio.h ] ; then echo /usr ; else echo NOTFOUND ; fi) PORTAUDIO_PATH ?= $(shell if [ -f /usr/local/include/portaudio.h ]; then echo /usr/local ; elif [ -f /usr/include/portaudio.h ] ; then echo /usr ; else echo NOTFOUND ; fi)
ifndef win
ifneq ($(PORTAUDIO_PATH),NOTFOUND) ifneq ($(PORTAUDIO_PATH),NOTFOUND)
XPDEV_CFLAGS += -DWITH_PORTAUDIO XPDEV_CFLAGS += -DWITH_PORTAUDIO
ifeq ($(os),linux) ifeq ($(os),linux)
...@@ -213,6 +214,7 @@ ifndef WITHOUT_PORTAUDIO ...@@ -213,6 +214,7 @@ ifndef WITHOUT_PORTAUDIO
endif endif
endif endif
endif endif
endif
ifndef win ifndef win
ifndef WITHOUT_ALSA_SOUND ifndef WITHOUT_ALSA_SOUND
...@@ -226,6 +228,7 @@ ifndef win ...@@ -226,6 +228,7 @@ ifndef win
endif endif
ifndef NO_PULSEAUDIO ifndef NO_PULSEAUDIO
ifndef win
ifeq ($(shell command -v pkg-config > /dev/null && pkg-config --exists libpulse-simple && echo 'YES'),YES) ifeq ($(shell command -v pkg-config > /dev/null && pkg-config --exists libpulse-simple && echo 'YES'),YES)
XPDEV-CFLAGS += -DWITH_PULSEAUDIO `pkg-config libpulse-simple --cflags` XPDEV-CFLAGS += -DWITH_PULSEAUDIO `pkg-config libpulse-simple --cflags`
XPDEV-MT_CFLAGS += -DWITH_PULSEAUDIO `pkg-config libpulse-simple --cflags` XPDEV-MT_CFLAGS += -DWITH_PULSEAUDIO `pkg-config libpulse-simple --cflags`
...@@ -235,3 +238,4 @@ ifndef NO_PULSEAUDIO ...@@ -235,3 +238,4 @@ ifndef NO_PULSEAUDIO
endif endif
endif endif
endif endif
endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment