Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* make sure we link against proper openmp library when using msvc

Browse Source 
* return error code from makensis process instead of 0
This commit is contained in:
Nathan Letwory
2008-10-02 06:11:47 +00:00
parent 3659b390bf
commit 59eaf36f97
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/Blender.py
View File

@@ -165,6 +165,9 @@ def setup_syslibs(lenv):
if not lenv['WITH_BF_STATICOPENAL']: if not lenv['WITH_BF_STATICOPENAL']:
syslibs += Split(lenv['BF_OPENAL_LIB']) syslibs += Split(lenv['BF_OPENAL_LIB'])
if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc': if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc':
if lenv['CC'] == 'cl.exe':
syslibs += ['vcomp']
else:
syslibs += ['gomp'] syslibs += ['gomp']
if lenv['WITH_BF_ICONV']: if lenv['WITH_BF_ICONV']:
syslibs += Split(lenv['BF_ICONV_LIB']) syslibs += Split(lenv['BF_ICONV_LIB'])

2
tools/btools.py
View File

@@ -531,5 +531,5 @@ def NSIS_Installer(target=None, source=None, env=None):
data, err = proc.communicate() data, err = proc.communicate()
rv = proc.wait() rv = proc.wait()
return 0 return err