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

link against libopenal by default rather than dlopening it

Browse source
This commit is contained in:
Ludwig Nussel 2005-11-13 21:01:44 +00:00
parent 17719e0c61
commit 1c2722a9ba
3 changed files with 126 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
code/unix/Makefile
View file

@ -51,6 +51,10 @@ ifndef USE_OPENAL
USE_OPENAL=1
endif
ifndef USE_OPENAL_DLOPEN
USE_OPENAL_DLOPEN=0
endif
ifndef BUILD_CLIENT
BUILD_CLIENT=1
endif
@ -121,6 +125,9 @@ ifeq ($(PLATFORM),linux)
ifeq ($(USE_OPENAL),1)
BASE_CFLAGS += -DUSE_OPENAL=1
ifeq ($(USE_OPENAL_DLOPEN),1)
BASE_CFLAGS += -DUSE_OPENAL_DLOPEN=1
endif
endif
ifeq ($(USE_SDL),1)
@ -168,6 +175,10 @@ ifeq ($(PLATFORM),linux)
THREAD_LDFLAGS=-lpthread
LDFLAGS=-ldl -lm
ifneq ($(USE_OPENAL_DLOPEN),1)
LDFLAGS += -lopenal
endif
ifeq ($(USE_SDL),1)
GLLDFLAGS=$(shell sdl-config --libs)
else
@ -224,6 +235,9 @@ ifeq ($(PLATFORM),mingw32)
ifeq ($(USE_OPENAL),1)
BASE_CFLAGS += -DUSE_OPENAL=1
ifeq ($(USE_OPENAL_DLOPEN),1)
BASE_CFLAGS += -DUSE_OPENAL_DLOPEN=1
endif
endif
DX_CFLAGS = -I$(DXSDK_DIR)/Include
@ -247,6 +261,10 @@ ifeq ($(PLATFORM),mingw32)
LDFLAGS= -mwindows -lwsock32 -lgdi32 -lwinmm -lole32
GLLDFLAGS=
ifneq ($(USE_OPENAL_DLOPEN),1)
LDFLAGS += -lopenal
endif
ifeq ($(ARCH),x86)
# build 32bit
BASE_CFLAGS += -m32