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

Fix PulseAudio build option display

The macro was only define in the xpdev GNUmakefile, not in Common,
so bbslist.c did not know if it was enabled or not, and always
showed it as disabled.
parent e37f0e00
Branches
Tags
No related merge requests found
Pipeline #7291 passed
......@@ -218,3 +218,14 @@ ifeq ($(shell if [ -f /usr/include/alsa/asoundlib.h ] ; then echo YES ; fi),YES)
XPDEV-MT_LIBS += -ldl
XPDEV_LIBS += -ldl
endif
ifndef NO_PULSEAUDIO
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-MT_CFLAGS += -DWITH_PULSEAUDIO `pkg-config libpulse-simple --cflags`
ifeq ($(os),linux)
XPDEV-MT_LIBS += -ldl
XPDEV_LIBS += -ldl
endif
endif
endif
......@@ -8,13 +8,6 @@ ifndef win
MTOBJS += $(MTOBJODIR)$(DIRSEP)xpevent$(OFILE)
endif
ifndef NO_PULSEAUDIO
ifeq ($(shell command -v pkg-config > /dev/null && pkg-config --exists libpulse-simple && echo 'YES'),YES)
CFLAGS += -DWITH_PULSEAUDIO `pkg-config libpulse-simple --cflags`
MT_CFLAGS += -DWITH_PULSEAUDIO `pkg-config libpulse-simple --cflags`
endif
endif
CFLAGS += -I. $(XPDEV_CFLAGS)
ifndef WITHOUT_ALSA_SOUND
ifeq ($(shell if [ -f /usr/include/alsa/asoundlib.h ] ; then echo YES ; fi),YES)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment