Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Another attempt to fix windows compilation (#556)

Browse Source
This commit is contained in:
Vincent Herbet 2018-09-08 21:12:57 +02:00 committed by GitHub
parent 9a2c586720
commit d2d121619f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AMBuildScript
View File

@ -291,6 +291,9 @@ class AMXXConfig(object):
'odbccp32.lib', 'odbccp32.lib',
] ]
if cxx.version >= 1900:
cxx.linkflags += ['legacy_stdio_definitions.lib', 'legacy_stdio_wide_specifiers.lib']
if builder.options.opt == '1': if builder.options.opt == '1':
cxx.cflags += ['/Ox'] cxx.cflags += ['/Ox']
cxx.linkflags += ['/OPT:ICF', '/OPT:REF'] cxx.linkflags += ['/OPT:ICF', '/OPT:REF']

3
modules/mysqlx/AMBuilder
View File

@ -36,9 +36,8 @@ if AMXX.mysql_path:
'/SECTION:.data,RW' '/SECTION:.data,RW'
] ]
if binary.compiler.vendor == 'msvc' and binary.compiler.version >= 1900: 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 += [
'msvc15hack.c' '../../public/msvc/msvc15hack.c'
] ]
binary.compiler.linkflags += [AMXX.zlib.binary] binary.compiler.linkflags += [AMXX.zlib.binary]

4
modules/regex/AMBuilder
View File

@ -24,5 +24,9 @@ binary.sources = [
if builder.target_platform == 'windows': if builder.target_platform == 'windows':
binary.sources += ['version.rc'] binary.sources += ['version.rc']
if binary.compiler.vendor == 'msvc' and binary.compiler.version >= 1900:
binary.sources += [
'../../public/msvc/msvc15hack.c'
]
AMXX.modules += [builder.Add(binary)] AMXX.modules += [builder.Add(binary)]

0
modules/mysqlx/msvc15hack.c → public/msvc/msvc15hack.c
View File