UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'vs2015'

Browse Source
This commit is contained in:
Nicholas Hastings 2016-06-11 12:14:12 -04:00
commit f12924458f
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AMBuildScript
View File

@ -403,6 +403,8 @@ class SMConfig(object):
if compiler.like('msvc'): if compiler.like('msvc'):
compiler.defines += ['COMPILER_MSVC', 'COMPILER_MSVC32'] compiler.defines += ['COMPILER_MSVC', 'COMPILER_MSVC32']
if compiler.version >= 1900:
compiler.linkflags += ['legacy_stdio_definitions.lib']
else: else:
compiler.defines += ['COMPILER_GCC'] compiler.defines += ['COMPILER_GCC']

2
core/AMBuilder
View File

@ -73,6 +73,8 @@ for sdk_name in SM.sdks:
vs_year = '' vs_year = ''
if msvc_ver == 1800: if msvc_ver == 1800:
vs_year = '2013' vs_year = '2013'
elif msvc_ver == 1900:
vs_year = '2015'
else: else:
raise Exception('Cannot find libprotobuf for MSVC version "' + str(compiler.version) + '"') raise Exception('Cannot find libprotobuf for MSVC version "' + str(compiler.version) + '"')

3
extensions/mysql/AMBuilder
View File

@ -28,6 +28,9 @@ if SM.mysql_root:
'wsock32.lib' '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 += [ binary.sources += [
'../../public/smsdk_ext.cpp', '../../public/smsdk_ext.cpp',
'mysql/MyBasicResults.cpp', 'mysql/MyBasicResults.cpp',

2
public/sm_platform.h
View File

@ -44,7 +44,7 @@
#if !defined WIN32_LEAN_AND_MEAN #if !defined WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif #endif
#if !defined snprintf #if !defined snprintf && defined _MSC_VER && _MSC_VER < 1900
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
#if !defined stat #if !defined stat