Merge branch 'vs2015'
This commit is contained in:
commit
f12924458f
@ -403,6 +403,8 @@ class SMConfig(object):
|
||||
|
||||
if compiler.like('msvc'):
|
||||
compiler.defines += ['COMPILER_MSVC', 'COMPILER_MSVC32']
|
||||
if compiler.version >= 1900:
|
||||
compiler.linkflags += ['legacy_stdio_definitions.lib']
|
||||
else:
|
||||
compiler.defines += ['COMPILER_GCC']
|
||||
|
||||
|
@ -73,6 +73,8 @@ for sdk_name in SM.sdks:
|
||||
vs_year = ''
|
||||
if msvc_ver == 1800:
|
||||
vs_year = '2013'
|
||||
elif msvc_ver == 1900:
|
||||
vs_year = '2015'
|
||||
else:
|
||||
raise Exception('Cannot find libprotobuf for MSVC version "' + str(compiler.version) + '"')
|
||||
|
||||
|
@ -28,6 +28,9 @@ if SM.mysql_root:
|
||||
'wsock32.lib'
|
||||
]
|
||||
|
||||
if binary.compiler.vendor == 'msvc' and binary.compiler.version >= 1900:
|
||||
binary.compiler.linkflags += ['legacy_stdio_definitions.lib', 'legacy_stdio_wide_specifiers.lib']
|
||||
|
||||
binary.sources += [
|
||||
'../../public/smsdk_ext.cpp',
|
||||
'mysql/MyBasicResults.cpp',
|
||||
|
@ -44,7 +44,7 @@
|
||||
#if !defined WIN32_LEAN_AND_MEAN
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
#if !defined snprintf
|
||||
#if !defined snprintf && defined _MSC_VER && _MSC_VER < 1900
|
||||
#define snprintf _snprintf
|
||||
#endif
|
||||
#if !defined stat
|
||||
|
Loading…
Reference in New Issue
Block a user