diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-06-18 14:23:12 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-06-19 13:02:21 +0300 |
| commit | 8c3dd6d83df467f3b8e53b6c97545eabf07768be (patch) | |
| tree | 1ec635e9cea07b23f0774d2ababa5c0a4ffbce57 /extern/glog/src/windows/preprocess.sh | |
| parent | 0f78a579047ec8946021ca58b8ee48f7486e6605 (diff) | |
Upgrade Google libraries
Upgrades Glog from 0.3.5 to 0.4.0, and Gtest from 0.8.0 to 0.10.0.
Hopefully this will solve compilation error on MSVC with C++17.
Diffstat (limited to 'extern/glog/src/windows/preprocess.sh')
| -rwxr-xr-x | extern/glog/src/windows/preprocess.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/glog/src/windows/preprocess.sh b/extern/glog/src/windows/preprocess.sh index 5398988e7ea..c35e92913b6 100755 --- a/extern/glog/src/windows/preprocess.sh +++ b/extern/glog/src/windows/preprocess.sh @@ -95,7 +95,7 @@ DLLDEF_DEFINES="\ -e "s!@ac_cv_have_libgflags@!0!g" \ -e "s!@ac_cv_have___builtin_expect@!0!g" \ -e "s!@ac_cv_cxx_using_operator@!1!g" \ - -e "s!@ac_cv___attribute___noreturn@!!g" \ + -e "s!@ac_cv___attribute___noreturn@!__declspec(noreturn)!g" \ -e "s!@ac_cv___attribute___noinline@!!g" \ -e "s!@ac_cv___attribute___printf_4_5@!!g" \ -e "s!@ac_google_attribute@!${HAVE___ATTRIBUTE__:-0}!g" \ |