diff options
author | Martijn Berger <martijn.berger@gmail.com> | 2013-12-27 22:46:55 +0400 |
---|---|---|
committer | Martijn Berger <martijn.berger@gmail.com> | 2013-12-27 22:46:55 +0400 |
commit | 42044a96e4274327b7e839e002939b46b959a655 (patch) | |
tree | 0be124c0866d570f60c60b0a5e248f4a1282631d /build_files/scons/config/win64-vc-config.py | |
parent | a92abf5089e152d8d1b1fd95278b307f56b6a193 (diff) |
Basic scons support for building with Visual Studio 2013 although full MSVC 2013 support still needs more work in scons itself
Diffstat (limited to 'build_files/scons/config/win64-vc-config.py')
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index a13f417c36c..2f757afee54 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -3,13 +3,20 @@ import subprocess CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE) CL_STDOUT, CL_STDERR = CL_OUT.communicate() -if "17.00." in CL_STDERR: +if "18.00." in CL_STDERR: + VC_VERSION = '12.0' + LCGDIR = '#../lib/win64_vc12' +elif "17.00." in CL_STDERR: VC_VERSION = '11.0' LCGDIR = '#../lib/win64_vc11' -else: +elif "15.00." in CL_STDERR: VC_VERSION = '9.0' LCGDIR = '#../lib/win64' - +else: + import sys + print("Visual C version not supported {}\n".format(CL_STDERR)) + sys.exit(1) + LIBDIR = '${LCGDIR}' WITH_BF_FFMPEG = True @@ -73,7 +80,10 @@ WITH_BF_OPENEXR = True WITH_BF_STATICOPENEXR = False BF_OPENEXR = LIBDIR + '/openexr' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR ' -BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread ' +if VC_VERSION == '12.0': + BF_OPENEXR_LIB = ' Iex-2_1 Half IlmImf-2_1 Imath-2_1 IlmThread-2_1 ' +else: + BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread ' BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' @@ -200,7 +210,10 @@ WITH_BF_STATICOCIO = True WITH_BF_BOOST = True BF_BOOST = '${LIBDIR}/boost' BF_BOOST_INC = '${BF_BOOST}/include' -if VC_VERSION == '11.0': +if VC_VERSION == '12.0': + BF_BOOST_LIB = 'libboost_date_time-vc120-mt-s-1_55 libboost_filesystem-vc120-mt-s-1_55 libboost_regex-vc120-mt-s-1_55 libboost_system-vc120-mt-s-1_55 libboost_thread-vc120-mt-s-1_55 libboost_wave-vc120-mt-s-1_55' + BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc120-mt-s-1_55' +elif VC_VERSION == '11.0': BF_BOOST_LIB = 'libboost_date_time-vc110-mt-s-1_53 libboost_filesystem-vc110-mt-s-1_53 libboost_regex-vc110-mt-s-1_53 libboost_system-vc110-mt-s-1_53 libboost_thread-vc110-mt-s-1_53 libboost_wave-vc110-mt-s-1_53' BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc110-mt-s-1_53' else: @@ -250,7 +263,10 @@ CXX_WARN = [] LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid', 'psapi'] PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib'] -if VC_VERSION == '11.0': +if VC_VERSION == '12.0': + BF_BUILDDIR = '..\\build\\win64-vc12' + BF_INSTALLDIR='..\\install\\win64-vc12' +elif VC_VERSION == '11.0': BF_BUILDDIR = '..\\build\\win64-vc11' BF_INSTALLDIR='..\\install\\win64-vc11' else: |