Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2006-06-23 21:45:50 +0400
committerKent Mein <mein@cs.umn.edu>2006-06-23 21:45:50 +0400
commite2e1f5ab2ac8bf1828d21db5c84ddcaa2378bb5d (patch)
treea4329f5273f0c2d38cd4da539f1e7da0650fc237 /source/Makefile
parentb4a61c441b7031cde32e74b5016a8279be6764a4 (diff)
Newer versions of openal require linking against lib alut.
I added a $(wildcard libalut) to the linked libraries. So if it exists its linked in. (Was causing issues on my laptop) Kent
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/Makefile b/source/Makefile
index 9bc04c2b4e6..ba11ea2893d 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -392,6 +392,8 @@ else
NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(SDLSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
+ ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a)
+ NAN_SND_LIBS += $(ALUT)
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
ifeq ($(OS),windows)
@@ -400,6 +402,8 @@ else
NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(SDLSOUND)
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)
else
NAN_SND_LIBS = $(SOUNDSYSTEM)
@@ -413,6 +417,8 @@ else
NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
+ ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a)
+ NAN_SND_LIBS += $(ALUT)
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
ifeq ($(OS), solaris)
@@ -421,6 +427,8 @@ else
NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(SDLSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
+ ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a)
+ NAN_SND_LIBS += $(ALUT)
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
NAN_SND_LIBS = $(SOUNDSYSTEM)