From 13ad17f96cd2cf51c8e40f578242e1e376c8ce00 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Tue, 1 Jan 2013 12:13:23 -0800 Subject: [PATCH] Add support for parsing more MSVC command line options to check_cfg. --- waflib/Tools/c_config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py index 16afb6f7..9eec8373 100755 --- a/waflib/Tools/c_config.py +++ b/waflib/Tools/c_config.py @@ -159,6 +159,8 @@ def parse_flags(self, line, uselib_store, env=None, force_static=False): elif st == '-L': if not ot: ot = lst.pop(0) appu('LIBPATH_' + uselib, [ot]) + elif x.startswith('/LIBPATH:'): + appu('LIBPATH_' + uselib, [x.replace('/LIBPATH:', '')]) elif x == '-pthread' or x.startswith('+') or x.startswith('-std'): app('CFLAGS_' + uselib, [x]) app('CXXFLAGS_' + uselib, [x]) @@ -182,7 +184,7 @@ def parse_flags(self, line, uselib_store, env=None, force_static=False): app('CFLAGS_' + uselib, tmp) app('CXXFLAGS_' + uselib, tmp) app('LINKFLAGS_' + uselib, tmp) - elif x.endswith('.a') or x.endswith('.so') or x.endswith('.dylib'): + elif x.endswith('.a') or x.endswith('.so') or x.endswith('.dylib') or x.endswith('.lib'): appu('LINKFLAGS_' + uselib, [x]) # not cool, #762 @conf