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

icl bugfixes

metadata
Wenzel Jakob 2011-06-01 18:46:00 +02:00
parent 8e3666adf5
commit f0ccbc4ba7
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/SConscript.configure
View File

@ -66,6 +66,7 @@ vars.Add('BOOSTLIBDIR', 'Boost library path')
vars.Add('TARGET_ARCH', 'Target architecture') vars.Add('TARGET_ARCH', 'Target architecture')
vars.Add('MSVC_VERSION', 'MS Visual C++ compiler version') vars.Add('MSVC_VERSION', 'MS Visual C++ compiler version')
vars.Add('QTDIR', 'Qt installation directory') vars.Add('QTDIR', 'Qt installation directory')
vars.Add('INTEL_COMPILER','Should the Intel C++ compiler be used?')
try: try:
env = Environment(options=vars, ENV = os.environ, tools=['default', 'qt4', 'icl12'], toolpath=['#data/scons']) env = Environment(options=vars, ENV = os.environ, tools=['default', 'qt4', 'icl12'], toolpath=['#data/scons'])
@ -91,7 +92,6 @@ if env.has_key('BASELIBDIR'):
env.Append(LIBPATH=env['BASELIBDIR']) env.Append(LIBPATH=env['BASELIBDIR'])
env.Decider('MD5-timestamp') env.Decider('MD5-timestamp')
#env.SetOption('num_jobs', multiprocessing.cpu_count())
AddOption("--dist", dest="dist", action="store_true", help='Make an official release') AddOption("--dist", dest="dist", action="store_true", help='Make an official release')

3
build/config-icl12-msv2010-win32.py
View File

@ -2,10 +2,11 @@ BUILDDIR = '#build/release'
CXX = 'icl' CXX = 'icl'
CC = 'icl' CC = 'icl'
LINK = 'xilink' LINK = 'xilink'
CXXFLAGS = ['/nologo', '/O3', '/Qipo', '/Qprec-div-', '/QxSSE2', '/QaxSSE3,SSE4.2', '/fp:fast=2', '/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/Qopenmp'] CXXFLAGS = ['/nologo', '/O3', '/Qipo', '/QxSSE2', '/QaxSSE3,SSE4.2', '/fp:fast=2', '/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/Qopenmp']
SHCXXFLAGS = CXXFLAGS SHCXXFLAGS = CXXFLAGS
TARGET_ARCH = 'x86' TARGET_ARCH = 'x86'
MSVC_VERSION = '10.0' MSVC_VERSION = '10.0'
INTEL_COMPILER = True
LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X86', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT', '/MANIFEST'] LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X86', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT', '/MANIFEST']
BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASEINCLUDE = ['#include', '#dependencies/windows/include']
BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32']

3
build/config-icl12-msv2010-win64.py
View File

@ -2,10 +2,11 @@ BUILDDIR = '#build/release'
CXX = 'icl' CXX = 'icl'
CC = 'icl' CC = 'icl'
LINK = 'xilink' LINK = 'xilink'
CXXFLAGS = ['/nologo', '/O3', '/Qipo', '/Qprec-div-', '/QxSSE2', '/QaxSSE3,SSE4.2', '/fp:fast=2', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/Qopenmp'] CXXFLAGS = ['/nologo', '/O3', '/Qipo', '/QxSSE2', '/QaxSSE3,SSE4.2', '/fp:fast=2', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/Qopenmp']
SHCXXFLAGS = CXXFLAGS SHCXXFLAGS = CXXFLAGS
TARGET_ARCH = 'x86_64' TARGET_ARCH = 'x86_64'
MSVC_VERSION = '10.0' MSVC_VERSION = '10.0'
INTEL_COMPILER = True
LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X64', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT', '/MANIFEST'] LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X64', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT', '/MANIFEST']
BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASEINCLUDE = ['#include', '#dependencies/windows/include']
BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32']

8
data/scons/icl12.py
View File

@ -93,12 +93,14 @@ def merge_script_vars(env,script,args=None,vars=None):
env.PrependENVPath(k, v, delete_existing=1) env.PrependENVPath(k, v, delete_existing=1)
def generate(env): def generate(env):
if 'INTEL_COMPILER' not in env or env['INTEL_COMPILER'] != True:
return
if env['TARGET_ARCH'] == 'x86': if env['TARGET_ARCH'] == 'x86':
arch = 'ia32' arch = 'ia32'
elif env['TARGET_ARCH'] == 'x86_64': elif env['TARGET_ARCH'] == 'x86_64' or env['TARGET_ARCH'] == 'amd64':
arch = 'ia32_intel64' arch = 'ia32_intel64'
else: else:
raise Exception('Unknown architecture!') raise Exception('Unknown architecture ' + env['TARGET_ARCH'])
if env['MSVC_VERSION'] == '9.0': if env['MSVC_VERSION'] == '9.0':
vsrelease = 'vs2008' vsrelease = 'vs2008'
@ -111,5 +113,7 @@ def generate(env):
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)
def exists(env): def exists(env):
if 'INTEL_COMPILER' not in env or env['INTEL_COMPILER'] != True:
return False
return 'ICPP_COMPOSER2011' in os.environ return 'ICPP_COMPOSER2011' in os.environ