sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Newer versions of openal require linking against lib alut.

Browse Source 
I added a $(wildcard libalut)  to the linked libraries.
So if it exists its linked in. (Was causing issues on my laptop)

Kent
This commit is contained in:
Kent Mein 2006-06-23 17:45:50 +00:00
parent b4a61c441b
commit e2e1f5ab2a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/Makefile
View File

@ -392,6 +392,8 @@ else
NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(SDLSOUND) NAN_SND_LIBS += $(SDLSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a)
NAN_SND_LIBS += $(ALUT)
NAN_SND_LIBS += $(SOUNDSYSTEM) NAN_SND_LIBS += $(SOUNDSYSTEM)
else else
ifeq ($(OS),windows) ifeq ($(OS),windows)
@ -400,6 +402,8 @@ else
NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(SDLSOUND) NAN_SND_LIBS += $(SDLSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
ALUT = $(wildcard $(NAN_OPENAL)/lib/alut_static.lib)
NAN_SND_LIBS += $(ALUT)
NAN_SND_LIBS += $(SOUNDSYSTEM) NAN_SND_LIBS += $(SOUNDSYSTEM)
else else
NAN_SND_LIBS = $(SOUNDSYSTEM) NAN_SND_LIBS = $(SOUNDSYSTEM)
@ -413,6 +417,8 @@ else
NAN_SND_LIBS += $(DUMMYSOUND) NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a)
NAN_SND_LIBS += $(ALUT)
NAN_SND_LIBS += $(SOUNDSYSTEM) NAN_SND_LIBS += $(SOUNDSYSTEM)
else else
ifeq ($(OS), solaris) ifeq ($(OS), solaris)
@ -421,6 +427,8 @@ else
NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(SDLSOUND) NAN_SND_LIBS += $(SDLSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a)
NAN_SND_LIBS += $(ALUT)
NAN_SND_LIBS += $(SOUNDSYSTEM) NAN_SND_LIBS += $(SOUNDSYSTEM)
else else
NAN_SND_LIBS = $(SOUNDSYSTEM) NAN_SND_LIBS = $(SOUNDSYSTEM)