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".
This commit is contained in:
Simon McVittie committed 2013-05-19 21:27:24 +01:00
1 parent b1da355644
commit 2821aa41d7
1 file changed
+4 -3
+4 -3
View File
@@ -274,6 +274,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),)
@@ -373,7 +374,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
@@ -666,7 +667,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
@@ -760,7 +761,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