Merge pull request #21 from john-peterson/build2

hike required windows version to vista
This commit is contained in:
Arvid Norberg 2015-07-07 22:39:08 -04:00
commit b472299524
2 changed files with 1 additions and 8 deletions

View File

@ -420,8 +420,7 @@ feature.compose <asserts>production : <define>TORRENT_PRODUCTION_ASSERTS=1 <defi
feature.compose <asserts>off : <define>TORRENT_USE_ASSERTS=0 ;
feature.compose <asserts>system : <define>TORRENT_USE_SYSTEM_ASSERTS=1 ;
feature windows-version : xp vista win7 : composite propagated link-incompatible ;
feature.compose <windows-version>xp : <define>_WIN32_WINNT=0x0501 ;
feature windows-version : vista win7 : composite propagated link-incompatible ;
feature.compose <windows-version>vista : <define>_WIN32_WINNT=0x0600 ;
feature.compose <windows-version>win7 : <define>_WIN32_WINNT=0x0601 ;

View File

@ -97,9 +97,6 @@ std::string demangle(char const* name)
}
#elif defined WIN32
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0501 // XP
#include "windows.h"
#include "dbghelp.h"
@ -143,9 +140,6 @@ TORRENT_EXPORT void print_backtrace(char* out, int len, int max_depth)
// visual studio 9 and up appears to support this
#elif defined WIN32 && _MSC_VER >= 1500
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0501 // XP
#include "windows.h"
#include "libtorrent/utf8.hpp"