kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for #35851:

Browse Source 
- Make scons work for non western CL.exe.
This commit is contained in:
Jürgen Herrmann 2013-06-24 05:45:03 +00:00
parent bfd0ceb4e0
commit 86bebb3380
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_files/scons/config/win32-vc-config.py
View File

@ -3,14 +3,14 @@ import subprocess
CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
CL_STDOUT, CL_STDERR = CL_OUT.communicate()
if CL_STDERR.find("Version 15.00.") == -1:
VC_VERSION = '11.0'
LCGDIR = '#../lib/windows_vc11'
else:
if CL_STDERR.find("17.00.") == -1:
VC_VERSION = '9.0'
LCGDIR = '#../lib/windows'
else:
VC_VERSION = '11.0'
LCGDIR = '#../lib/windows_vc11'
LIBDIR = '${LCGDIR}'
WITH_BF_FFMPEG = True

10
build_files/scons/config/win64-vc-config.py
View File

@ -3,14 +3,14 @@ import subprocess
CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
CL_STDOUT, CL_STDERR = CL_OUT.communicate()
if CL_STDERR.find("Version 15.00.") == -1:
VC_VERSION = '11.0'
LCGDIR = '#../lib/win64_vc11'
else:
if CL_STDERR.find("17.00.") == -1:
VC_VERSION = '9.0'
LCGDIR = '#../lib/win64'
else:
VC_VERSION = '11.0'
LCGDIR = '#../lib/win64_vc11'
LIBDIR = '${LCGDIR}'
WITH_BF_FFMPEG = True