Another attempt to fix windows compilation (#556)
This commit is contained in:
parent
9a2c586720
commit
d2d121619f
|
@ -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']
|
||||||
|
|
|
@ -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 += [
|
'../../public/msvc/msvc15hack.c'
|
||||||
'msvc15hack.c'
|
|
||||||
]
|
]
|
||||||
|
|
||||||
binary.compiler.linkflags += [AMXX.zlib.binary]
|
binary.compiler.linkflags += [AMXX.zlib.binary]
|
||||||
|
|
|
@ -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)]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user