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
path: root/tools
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2006-02-05 14:11:44 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2006-02-05 14:11:44 +0300
commit257124a44f98119bd576a6e43fa529506a950c7c (patch)
treeffd0847e67d0a47f48bbf35782ad0e1575c2e961 /tools
parenteb185d7032231b5bde9c83b055236e7f63a70be3 (diff)
- remove Xmu and Xext from linking line for linux2, as they are not needed
+ WITH_BF_OPENAL actually enables or disables use of OpenAL + WITH_BF_OPENEXR removes openexr libs from linking if disabled
Diffstat (limited to 'tools')
-rw-r--r--tools/Blender.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/Blender.py b/tools/Blender.py
index 060d04a09bc..e3d4740d0e5 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -137,11 +137,12 @@ def setup_syslibs(lenv):
lenv['BF_GETTEXT_LIB']
]
if lenv['WITH_BF_OPENAL']:
- lenv['BF_OPENAL_LIB'],
+ syslibs += Split(lenv['BF_OPENAL_LIB'])
if lenv['OURPLATFORM']=='win32vc':
syslibs += Split(lenv['BF_ICONV_LIB'])
syslibs += Split(lenv['BF_TIFF_LIB'])
- syslibs += Split(lenv['BF_OPENEXR_LIB'])
+ if lenv['WITH_BF_OPENEXR']:
+ syslibs += Split(lenv['BF_OPENEXR_LIB'])
syslibs += Split(lenv['BF_SDL_LIB'])
syslibs += Split(lenv['BF_OPENGL_LIB'])
syslibs += Split(lenv['LLIBS'])