From 9d55890bd5c6cf6be07a6de3c106942844b80616 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 19 May 2013 21:06:16 +0100 Subject: Allow OpenAL to be in a non-standard location on all platforms Similar to libcurl, we didn't use OPENAL_LIBS and assumed it was always "-lopenal". --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4b9af9c2..6334667c 100644 --- a/Makefile +++ b/Makefile @@ -267,6 +267,7 @@ ifneq ($(BUILD_CLIENT),0) else # assume they're in the system default paths (no -I or -L needed) CURL_LIBS=-lcurl + OPENAL_LIBS=-lopenal endif # Use sdl-config if all else fails ifeq ($(SDL_CFLAGS),) @@ -364,7 +365,7 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu")) ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) - CLIENT_LIBS += -lopenal + CLIENT_LIBS += $(OPENAL_LIBS) endif endif @@ -658,7 +659,7 @@ ifeq ($(PLATFORM),freebsd) # optional features/libraries ifeq ($(USE_OPENAL),1) ifeq ($(USE_OPENAL_DLOPEN),1) - CLIENT_LIBS += $(THREAD_LIBS) -lopenal + CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS) endif endif @@ -750,7 +751,7 @@ ifeq ($(PLATFORM),openbsd) ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) - CLIENT_LIBS += $(THREAD_LIBS) -lopenal + CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS) endif endif -- cgit