diff options
| author | fanquake <fanquake@gmail.com> | 2020-08-25 11:09:05 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-08-25 11:52:52 +0800 |
| commit | 8e0f341779e1d2754432765ec09deb7488f5b093 (patch) | |
| tree | 76929c861b9bfc0ede3a5b3c90500c0bd6ed6f10 /configure.ac | |
| parent | c6b730dbfcbd454132a660211002f19c6960f014 (diff) | |
| parent | 1ccb9f30c040daf688f89f0d63e9f5e7b131d193 (diff) | |
| download | bitcoin-8e0f341779e1d2754432765ec09deb7488f5b093.tar.xz | |
Merge #15704: Move Win32 defines to configure.ac to ensure they are globally defined
1ccb9f30c040daf688f89f0d63e9f5e7b131d193 Move Win32 defines to configure.ac to ensure they are globally defined (Luke Dashjr)
Pull request description:
#9245 no longer needs this, since the main `_WIN32_WINNT` got bumped by something else.
So rather than just lose it, might as well get it merged in independently.
I'm not aware of any practical effects, but it seems safer to use the same API versions everywhere.
ACKs for top commit:
fanquake:
ACK 1ccb9f30c040daf688f89f0d63e9f5e7b131d193 - checked that the binaries produced are the same.
Tree-SHA512: 273e9186579197be01b443b6968e26b9a8031d356fabc5b73aa967fcdb837df195b7ce0fc4e4529c85d9b86da6f2d7ff1bf56a3ff0cbbcd8cee8a9c2bf70a244
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index edb4ef0dc8..acd4e0cf6c 100644 --- a/configure.ac +++ b/configure.ac @@ -604,7 +604,7 @@ case $host in AC_MSG_ERROR("windres not found") fi - CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D_WIN32_WINNT=0x0601" + CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN" dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against. dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override |