zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move Win32 defines to configure.ac to ensure they are globally defined 

common.vcxproj used for MSVC builds

(cherry picked from commit 1ccb9f30c040daf688f89f0d63e9f5e7b131d193)
This commit is contained in:
Luke Dashjr 2017-08-21 14:59:17 +00:00 committed by Jack Grigg
parent 182a9af25e
commit 5bac61119a
4 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -401,7 +401,7 @@ case $host in
ZC_REQUIRE_TOOL(WINDRES, windres) ZC_REQUIRE_TOOL(WINDRES, windres)
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"
LEVELDB_TARGET_FLAGS="-DOS_WINDOWS" LEVELDB_TARGET_FLAGS="-DOS_WINDOWS"
dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against. dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.

3
src/compat.h
View File

@ -11,9 +11,6 @@
#endif #endif
#ifdef WIN32 #ifdef WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
#endif
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif #endif

1
src/support/lockedpool.cpp
View File

@ -10,7 +10,6 @@
#endif #endif
#ifdef WIN32 #ifdef WIN32
#define WIN32_LEAN_AND_MEAN 1
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif #endif

6
src/util.cpp
View File

@ -52,12 +52,6 @@
#pragma warning(disable:4717) #pragma warning(disable:4717)
#endif #endif
#ifdef _WIN32_IE
#undef _WIN32_IE
#endif
#define _WIN32_IE 0x0501
#define WIN32_LEAN_AND_MEAN 1
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif #endif