diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-19 17:32:23 +0000 |
|---|---|---|
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-19 17:32:23 +0000 |
| commit | ddc535741996b5ed42bb4d2c1bbcd371573a5bfd (patch) | |
| tree | 36a5ceaac39300ee26e84bf28836de0f46d72716 /src/gflags.cc | |
| parent | 9242578bc18a220c41ce07e024d620465ec9e434 (diff) | |
| download | gflags-ddc535741996b5ed42bb4d2c1bbcd371573a5bfd.tar.gz gflags-ddc535741996b5ed42bb4d2c1bbcd371573a5bfd.tar.bz2 gflags-ddc535741996b5ed42bb4d2c1bbcd371573a5bfd.zip | |
Add link dependency on shlwapi.lib during build configuration instead of #pragma comment statement. Use this library also on MinGW.
Diffstat (limited to 'src/gflags.cc')
| -rwxr-xr-x[-rw-r--r--] | src/gflags.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gflags.cc b/src/gflags.cc index b314f08..285050f 100644..100755 --- a/src/gflags.cc +++ b/src/gflags.cc @@ -95,9 +95,8 @@ #include <errno.h> #if defined(HAVE_FNMATCH_H) # include <fnmatch.h> -#elif defined(_MSC_VER) && defined(HAVE_SHLWAPI_H) +#elif defined(HAVE_SHLWAPI_H) # include <shlwapi.h> -# pragma comment(lib, "shlwapi.lib") #endif #include <stdarg.h> // For va_list and related operations #include <stdio.h> @@ -1310,7 +1309,7 @@ string CommandLineFlagParser::ProcessOptionsFromStringLocked( #if defined(HAVE_FNMATCH_H) || fnmatch(glob.c_str(), ProgramInvocationName(), FNM_PATHNAME) == 0 || fnmatch(glob.c_str(), ProgramInvocationShortName(), FNM_PATHNAME) == 0 -#elif defined(_MSC_VER) && defined(HAVE_SHLWAPI_H) +#elif defined(HAVE_SHLWAPI_H) || PathMatchSpec(glob.c_str(), ProgramInvocationName()) || PathMatchSpec(glob.c_str(), ProgramInvocationShortName()) #endif |