okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow OpenAL to be in a non-standard location on all platforms

Browse source 
Similar to libcurl, we didn't use OPENAL_LIBS and assumed it was
always "-lopenal".
This commit is contained in:
Simon McVittie 2013-05-19 21:06:16 +01:00
parent b1da355644
commit 2821aa41d7
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -274,6 +274,7 @@ ifneq ($(BUILD_CLIENT),0)
else else
# assume they're in the system default paths (no -I or -L needed) # assume they're in the system default paths (no -I or -L needed)
CURL_LIBS=-lcurl CURL_LIBS=-lcurl
OPENAL_LIBS=-lopenal
endif endif
# Use sdl-config if all else fails # Use sdl-config if all else fails
ifeq ($(SDL_CFLAGS),) ifeq ($(SDL_CFLAGS),)
@ -373,7 +374,7 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
ifeq ($(USE_OPENAL),1) ifeq ($(USE_OPENAL),1)
ifneq ($(USE_OPENAL_DLOPEN),1) ifneq ($(USE_OPENAL_DLOPEN),1)
CLIENT_LIBS += -lopenal CLIENT_LIBS += $(OPENAL_LIBS)
endif endif
endif endif
@ -666,7 +667,7 @@ ifeq ($(PLATFORM),freebsd)
# optional features/libraries # optional features/libraries
ifeq ($(USE_OPENAL),1) ifeq ($(USE_OPENAL),1)
ifeq ($(USE_OPENAL_DLOPEN),1) ifeq ($(USE_OPENAL_DLOPEN),1)
CLIENT_LIBS += $(THREAD_LIBS) -lopenal CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
endif endif
endif endif
@ -760,7 +761,7 @@ ifeq ($(PLATFORM),openbsd)
ifeq ($(USE_OPENAL),1) ifeq ($(USE_OPENAL),1)
ifneq ($(USE_OPENAL_DLOPEN),1) ifneq ($(USE_OPENAL_DLOPEN),1)
CLIENT_LIBS += $(THREAD_LIBS) -lopenal CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
endif endif
endif endif