Skip to content

Commit

Permalink
Allow OpenAL to be in a non-standard location on all platforms
Browse files Browse the repository at this point in the history
Similar to libcurl, we didn't use OPENAL_LIBS and assumed it was
always "-lopenal".
  • Loading branch information
smcv committed May 19, 2013
1 parent b1da355 commit 2821aa4
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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),)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 2821aa4

Please sign in to comment.