yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-23 04:52:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove support for static linked OpenAL.

Browse source 
We haven't used that for years and it just complicates things.
This commit is contained in:
Yamagi Burmeister 2018-08-14 11:51:55 +02:00
parent daf3dc6f41
commit cf09fb2a99
2 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Makefile
View file

@ -31,12 +31,6 @@
# installed # installed
WITH_OPENAL:=yes WITH_OPENAL:=yes
# Enables optional runtime loading of OpenAL (dlopen or
# similar). If set to "no", the library is linked in at
# compile time in the normal way. On Windows this option
# is ignored, OpenAL is always loaded at runtime.
DLOPEN_OPENAL:=yes
# Enable systemwide installation of game assets # Enable systemwide installation of game assets
WITH_SYSTEMWIDE:=no WITH_SYSTEMWIDE:=no
@ -332,7 +326,7 @@ build/client/%.o: %.c
${Q}$(CC) -c $(CFLAGS) $(SDLCFLAGS) $(ZIPCFLAGS) $(INCLUDE) -o $@ $< ${Q}$(CC) -c $(CFLAGS) $(SDLCFLAGS) $(ZIPCFLAGS) $(INCLUDE) -o $@ $<
ifeq ($(WITH_OPENAL),yes) ifeq ($(WITH_OPENAL),yes)
release/yquake2.exe : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"openal32.dll"' -DDLOPEN_OPENAL release/yquake2.exe : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"openal32.dll"'
endif endif
release/yquake2.exe : LDFLAGS += -mwindows release/yquake2.exe : LDFLAGS += -mwindows
@ -359,23 +353,14 @@ endif
release/quake2 : CFLAGS += -Wno-unused-result release/quake2 : CFLAGS += -Wno-unused-result
ifeq ($(WITH_OPENAL),yes) ifeq ($(WITH_OPENAL),yes)
ifeq ($(DLOPEN_OPENAL),yes)
ifeq ($(YQ2_OSTYPE), OpenBSD) ifeq ($(YQ2_OSTYPE), OpenBSD)
release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so"' -DDLOPEN_OPENAL release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so"'
else ifeq ($(YQ2_OSTYPE), Darwin) else ifeq ($(YQ2_OSTYPE), Darwin)
release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.dylib"' -I/usr/local/opt/openal-soft/include -DDLOPEN_OPENAL release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.dylib"' -I/usr/local/opt/openal-soft/include
release/quake2 : LDFLAGS += -L/usr/local/opt/openal-soft/lib -rpath /usr/local/opt/openal-soft/lib release/quake2 : LDFLAGS += -L/usr/local/opt/openal-soft/lib -rpath /usr/local/opt/openal-soft/lib
else else
release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1"' -DDLOPEN_OPENAL release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1"'
endif endif
else # !DLOPEN_OPENAL
release/quake2 : CFLAGS += -DUSE_OPENAL
release/quake2 : LDFLAGS += -lopenal
ifeq ($(YQ2_OSTYPE), Darwin)
release/quake2 : CFLAGS += -I/usr/local/opt/openal-soft/include
release/quake2 : LDFLAGS += -L/usr/local/opt/openal-soft/lib -rpath /usr/local/opt/openal-soft/lib
endif # Darwin
endif # !DLOPEN_OPENAL
endif # WITH_OPENAL endif # WITH_OPENAL
ifeq ($(YQ2_OSTYPE), FreeBSD) ifeq ($(YQ2_OSTYPE), FreeBSD)

8
src/client/sound/qal.c
View file

@ -43,9 +43,7 @@
static ALCcontext *context; static ALCcontext *context;
static ALCdevice *device; static ALCdevice *device;
static cvar_t *al_device; static cvar_t *al_device;
#ifdef DLOPEN_OPENAL
static cvar_t *al_driver; static cvar_t *al_driver;
#endif
static void *handle; static void *handle;
/* Function pointers for OpenAL management */ /* Function pointers for OpenAL management */
@ -341,7 +339,6 @@ QAL_Init()
{ {
al_device = Cvar_Get("al_device", "", CVAR_ARCHIVE); al_device = Cvar_Get("al_device", "", CVAR_ARCHIVE);
#ifdef DLOPEN_OPENAL
/* DEFAULT_OPENAL_DRIVER is defined at compile time via the compiler */ /* DEFAULT_OPENAL_DRIVER is defined at compile time via the compiler */
al_driver = Cvar_Get("al_driver", DEFAULT_OPENAL_DRIVER, CVAR_ARCHIVE); al_driver = Cvar_Get("al_driver", DEFAULT_OPENAL_DRIVER, CVAR_ARCHIVE);
@ -355,11 +352,8 @@ QAL_Init()
Com_Printf("Loading %s failed! Disabling OpenAL.\n", al_driver->string); Com_Printf("Loading %s failed! Disabling OpenAL.\n", al_driver->string);
return false; return false;
} }
#define ALSYMBOL(handle, sym) Sys_GetProcAddress(handle, #sym) #define ALSYMBOL(handle, sym) Sys_GetProcAddress(handle, #sym)
#else
handle = NULL;
# define ALSYMBOL(handle, sym) sym
#endif
/* Connect function pointers to management functions */ /* Connect function pointers to management functions */
qalcCreateContext = ALSYMBOL(handle, alcCreateContext); qalcCreateContext = ALSYMBOL(handle, alcCreateContext);