diff options
| author | Jack Lloyd <[email protected]> | 2020-02-07 09:07:01 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2020-02-07 13:21:27 -0500 |
| commit | 23426a58dcad1d92ea2a3e14abf0da8040818345 (patch) | |
| tree | 997fa60d21c36ca0ae896ce6caaa258684e117ed /src/scripts | |
| parent | 1a3d57568cff23a892b5f164af3975e0cc4e421c (diff) | |
Define _UNICODE as well
Allow multiple uses of --extra-cxxflags
See GH #2254 and #2256
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/ci/appveyor.yml | 2 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml index 4c0444f38..527f55d93 100644 --- a/src/scripts/ci/appveyor.yml +++ b/src/scripts/ci/appveyor.yml @@ -60,7 +60,7 @@ environment: BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x64-1_69" MAKE_TOOL: jom TARGET_CC: msvc - EXTRA_FLAGS: "--extra-cxxflags=/DUNICODE" + EXTRA_FLAGS: "--extra-cxxflags=/DUNICODE --extra-cxxflags=/D_UNICODE" # MSVC 2019 static x86-64 w/debug iterators - CC: VC2019 diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 55f1692d7..91697b32c 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -73,8 +73,8 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, if target_cpu is not None: flags += ['--cpu=%s' % (target_cpu)] - if extra_cxxflags != '': - flags += ['--extra-cxxflags=%s' % (extra_cxxflags)] + for flag in extra_cxxflags: + flags += ['--extra-cxxflags=%s' % (flag)] if target in ['shared', 'mini-shared']: build_targets += ['shared'] @@ -345,7 +345,7 @@ def parse_args(args): parser.add_option('--make-tool', metavar='TOOL', default='make', help='Specify tool to run to build source (default %default)') - parser.add_option('--extra-cxxflags', metavar='FLAGS', default='', + parser.add_option('--extra-cxxflags', metavar='FLAGS', default=[], action='append', help='Specify extra build flags') parser.add_option('--cpu', default=None, |