Use pkg-config more where appropriate.

This commit is contained in:
Themaister 2011-06-25 17:15:58 +02:00
parent 59c92dddc3
commit 72fb694e97
3 changed files with 7 additions and 5 deletions

View File

@ -55,11 +55,13 @@ endif
ifeq ($(HAVE_ALSA), 1) ifeq ($(HAVE_ALSA), 1)
OBJ += audio/alsa.o OBJ += audio/alsa.o
LIBS += -lasound LIBS += $(ALSA_LIBS)
DEFINES += $(ALSA_CFLAGS)
endif endif
ifeq ($(HAVE_ROAR), 1) ifeq ($(HAVE_ROAR), 1)
OBJ += audio/roar.o OBJ += audio/roar.o
LIBS += -lroar LIBS += $(ROAR_LIBS)
DEFINES += $(ROAR_CFLAGS)
endif endif
ifeq ($(HAVE_AL), 1) ifeq ($(HAVE_AL), 1)
OBJ += audio/openal.o OBJ += audio/openal.o

View File

@ -18,7 +18,7 @@
#include "driver.h" #include "driver.h"
#include <stdlib.h> #include <stdlib.h>
#include <alsa/asoundlib.h> #include <asoundlib.h>
#include "general.h" #include "general.h"
#define TRY_ALSA(x) if ( x < 0 ) { \ #define TRY_ALSA(x) if ( x < 0 ) { \

View File

@ -24,7 +24,7 @@ fi
check_lib DYLIB $DYLIB dlopen check_lib DYLIB $DYLIB dlopen
check_lib NETPLAY -lc socket check_lib NETPLAY -lc socket
check_lib ALSA -lasound snd_pcm_open check_pkgconf ALSA alsa
check_header OSS sys/soundcard.h check_header OSS sys/soundcard.h
check_header OSS_BSD soundcard.h check_header OSS_BSD soundcard.h
check_lib OSS_LIB -lossaudio check_lib OSS_LIB -lossaudio
@ -42,7 +42,7 @@ else
fi fi
check_pkgconf RSOUND rsound 1.1 check_pkgconf RSOUND rsound 1.1
check_lib ROAR -lroar roar_vs_new check_pkgconf ROAR libroar
check_pkgconf JACK jack 0.120.1 check_pkgconf JACK jack 0.120.1
check_pkgconf PULSE libpulse check_pkgconf PULSE libpulse