diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-09-01 02:23:28 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-09-01 02:23:28 +0400 |
| commit | 4e39a8f939fff178d320c88c290e927bddd98571 (patch) | |
| tree | f4e34bcea7d7a367867a1e1ec73de753d57cf29a /build_files/scons | |
| parent | 803c462f0494452116f2772c4629b7946d8c04d5 (diff) | |
| parent | fda711a85185dc8ff5c399db038853c75c411e51 (diff) | |
merge with trunk r50303
Diffstat (limited to 'build_files/scons')
| -rw-r--r-- | build_files/scons/config/win64-mingw-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index cbd17e44dae..9aedcfd1e89 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -174,7 +174,7 @@ WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2'] #May produce errors with unsupported MinGW-w64 builds -WITH_BF_OPENMP = True +WITH_BF_OPENMP = False ## CC = 'gcc' diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 56d13649cd1..4ab020dc26a 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -845,6 +845,8 @@ class BlenderEnvironment(SConsEnvironment): print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC lenv = self.Clone() lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS']) + if lenv['OURPLATFORM'] in ('win32-mingw', 'win64-mingw', 'linuxcross', 'cygwin', 'linux'): + lenv.Replace(LINK = '$CXX') if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'): if lenv['BF_DEBUG']: lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt']) |