* make sure we link against proper openmp library when using msvc
* return error code from makensis process instead of 0
This commit is contained in:
parent
3659b390bf
commit
59eaf36f97
@ -165,7 +165,10 @@ def setup_syslibs(lenv):
|
||||
if not lenv['WITH_BF_STATICOPENAL']:
|
||||
syslibs += Split(lenv['BF_OPENAL_LIB'])
|
||||
if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc':
|
||||
syslibs += ['gomp']
|
||||
if lenv['CC'] == 'cl.exe':
|
||||
syslibs += ['vcomp']
|
||||
else:
|
||||
syslibs += ['gomp']
|
||||
if lenv['WITH_BF_ICONV']:
|
||||
syslibs += Split(lenv['BF_ICONV_LIB'])
|
||||
if lenv['WITH_BF_OPENEXR']:
|
||||
|
@ -531,5 +531,5 @@ def NSIS_Installer(target=None, source=None, env=None):
|
||||
data, err = proc.communicate()
|
||||
rv = proc.wait()
|
||||
|
||||
return 0
|
||||
return err
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user