mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

icl12 build fix

metadata
Wenzel Jakob 2011-06-03 14:15:13 -07:00
parent b15e23dd9d
commit 3aebde5df4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/scons/icl12.py
View File

@ -97,8 +97,10 @@ def generate(env):
return return
if env['TARGET_ARCH'] == 'x86': if env['TARGET_ARCH'] == 'x86':
arch = 'ia32' arch = 'ia32'
arch_redist = 'ia32'
elif env['TARGET_ARCH'] == 'x86_64' or env['TARGET_ARCH'] == 'amd64': elif env['TARGET_ARCH'] == 'x86_64' or env['TARGET_ARCH'] == 'amd64':
arch = 'ia32_intel64' arch = 'ia32_intel64'
arch_redist = 'intel64'
else: else:
raise Exception('Unknown architecture ' + env['TARGET_ARCH']) raise Exception('Unknown architecture ' + env['TARGET_ARCH'])
@ -111,7 +113,7 @@ def generate(env):
icpp_path = os.environ.get('ICPP_COMPOSER2011') icpp_path = os.environ.get('ICPP_COMPOSER2011')
merge_script_vars(env, os.path.join(icpp_path, 'bin/iclvars.bat'), arch + ' ' + vsrelease) merge_script_vars(env, os.path.join(icpp_path, 'bin/iclvars.bat'), arch + ' ' + vsrelease)
env['REDIST_PATH'] = os.path.join(os.path.join(os.path.join(icpp_path, 'redist'), arch), 'compiler') env['REDIST_PATH'] = os.path.join(os.path.join(os.path.join(icpp_path, 'redist'), arch_redist), 'compiler')
def exists(env): def exists(env):
if 'INTEL_COMPILER' not in env or env['INTEL_COMPILER'] != True: if 'INTEL_COMPILER' not in env or env['INTEL_COMPILER'] != True: