diff options
| author | David Robillard <d@drobilla.net> | 2019-01-06 16:20:01 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-01-12 19:13:21 +0100 |
| commit | fc35c2ceffff29ec0660370418d0f4160dc3f111 (patch) | |
| tree | 642b230303fd821a0649afe875db4f67c96fb17f | |
| parent | 5ea8f99f6e1246079c1fe6bb590c38a53aadd40d (diff) | |
| download | autowaf-fc35c2ceffff29ec0660370418d0f4160dc3f111.tar.gz autowaf-fc35c2ceffff29ec0660370418d0f4160dc3f111.tar.bz2 autowaf-fc35c2ceffff29ec0660370418d0f4160dc3f111.zip | |
Fix MSVC CFLAGS
| -rw-r--r-- | extras/autowaf.py | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/extras/autowaf.py b/extras/autowaf.py index feaae3c..a4a26f6 100644 --- a/extras/autowaf.py +++ b/extras/autowaf.py @@ -249,16 +249,37 @@ def configure(conf): conf.env['CXXFLAGS'] = ['-O0', '-g'] else: if conf.env['MSVC_COMPILER']: - conf.env['CFLAGS'] = ['/MD', '/FS', '/DNDEBUG'] - conf.env['CXXFLAGS'] = ['/MD', '/FS', '/DNDEBUG'] + append_cxx_flags(['/MD', '/FS', '/DNDEBUG']) else: append_cxx_flags(['-DNDEBUG']) if conf.env.MSVC_COMPILER: Options.options.no_coverage = True - if Options.options.strict: - conf.env.append_value('CFLAGS', ['/Wall']) - conf.env.append_value('CXXFLAGS', ['/Wall']) + append_cxx_flags(['/nologo', + '/FS', + '/DNDEBUG', + '/D_CRT_SECURE_NO_WARNINGS', + '/experimental:external', + '/external:W0', + '/external:anglebrackets']) + conf.env.append_value('LINKFLAGS', '/nologo') + if Options.options.strict or Options.options.ultra_strict: + ms_strict_flags = ['/Wall', + '/wd4061', + '/wd4200', + '/wd4514', + '/wd4571', + '/wd4625', + '/wd4626', + '/wd4706', + '/wd4710', + '/wd4820', + '/wd5026', + '/wd5027', + '/wd5045'] + conf.env.append_value('CFLAGS', ms_strict_flags) + conf.env.append_value('CXXFLAGS', ms_strict_flags) + conf.env.append_value('CXXFLAGS', ['/EHsc']) else: if Options.options.ultra_strict: Options.options.strict = True @@ -346,7 +367,7 @@ def set_c_lang(conf, lang): "Set a specific C language standard, like 'c99' or 'c11'" if conf.env.MSVC_COMPILER: # MSVC has no hope or desire to compile C99, just compile as C++ - conf.env.append_unique('CFLAGS', ['-TP']) + conf.env.append_unique('CFLAGS', ['/TP']) else: flag = '-std=%s' % lang conf.check(cflags=['-Werror', flag], @@ -370,7 +391,7 @@ def set_modern_c_flags(conf): if 'COMPILER_CC' in conf.env: if conf.env.MSVC_COMPILER: # MSVC has no hope or desire to compile C99, just compile as C++ - conf.env.append_unique('CFLAGS', ['-TP']) + conf.env.append_unique('CFLAGS', ['/TP']) else: for flag in ['-std=c11', '-std=c99']: if conf.check(cflags=['-Werror', flag], mandatory=False, |