Choose correct libprotobuf build for current msvc version on Windows.

This commit is contained in:
Nicholas Hastings 2014-02-28 20:44:10 -05:00
parent 5b96047ce8
commit 3c6dd2cb79

View File

@ -34,10 +34,21 @@ for sdk_name in SM.sdks:
elif builder.target_platform == 'mac': elif builder.target_platform == 'mac':
lib_path = os.path.join(sdk.path, 'lib', 'osx32', 'release', 'libprotobuf.a') lib_path = os.path.join(sdk.path, 'lib', 'osx32', 'release', 'libprotobuf.a')
elif builder.target_platform == 'windows': elif builder.target_platform == 'windows':
if 'DEBUG' in compiler.defines: msvc_ver = int(compiler.cxx.version)
lib_path = os.path.join(sdk.path, 'lib', 'win32', 'debug', 'vs2010', 'libprotobuf.lib') vs_year = ''
if msvc_ver == 1800:
vs_year = '2013'
elif msvc_ver == 1700:
vs_year = '2012'
elif msvc_ver == 1600:
vs_year = '2010'
else: else:
lib_path = os.path.join(sdk.path, 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib') raise Exception('Cannot find libprotobuf for MSVC version "' + compiler.cxx.version + '"')
if 'DEBUG' in compiler.defines:
lib_path = os.path.join(sdk.path, 'lib', 'win32', 'debug', 'vs' + vs_year, 'libprotobuf.lib')
else:
lib_path = os.path.join(sdk.path, 'lib', 'win32', 'release', 'vs' + vs_year, 'libprotobuf.lib')
compiler.linkflags.insert(0, binary.Dep(lib_path)) compiler.linkflags.insert(0, binary.Dep(lib_path))
binary.sources += [ binary.sources += [