Use upstream range-v3 on MSVC.

The build works using MSVS 15.9 and latest range-v3 code.
This commit is contained in:
John Preston 2018-11-14 17:20:24 +04:00
parent d3a261de89
commit 60103f7ad6
7 changed files with 1 additions and 32 deletions

View File

@ -22,9 +22,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <set>
#include <range/v3/all.hpp>
#ifdef Q_OS_WIN
#include "platform/win/windows_range_v3_helpers.h"
#endif // Q_OS_WIN
#include "base/flat_map.h"
#include "base/flat_set.h"

View File

@ -27,9 +27,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <atomic>
#include <range/v3/all.hpp>
#ifdef Q_OS_WIN
#include "platform/win/windows_range_v3_helpers.h"
#endif // Q_OS_WIN
#include "base/flat_map.h"
#include "base/flat_set.h"

View File

@ -1,18 +0,0 @@
/*
This file is part of Telegram Desktop,
the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
namespace ranges {
inline namespace v3 {
namespace {
constexpr auto &&make_iterator_range = make_range;
} // namespace
} // inline namespace v3
} // namespace ranges

View File

@ -54,9 +54,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <optional>
#include <range/v3/all.hpp>
#ifdef Q_OS_WIN
#include "platform/win/windows_range_v3_helpers.h"
#endif // Q_OS_WIN
// Ensures/Expects.
#include <gsl/gsl_assert>

View File

@ -21,9 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <set>
#include <range/v3/all.hpp>
#ifdef Q_OS_WIN
#include "platform/win/windows_range_v3_helpers.h"
#endif // Q_OS_WIN
#include "base/flat_map.h"
#include "base/flat_set.h"

View File

@ -515,7 +515,6 @@
<(src_loc)/platform/win/windows_dlls.h
<(src_loc)/platform/win/windows_event_filter.cpp
<(src_loc)/platform/win/windows_event_filter.h
<(src_loc)/platform/win/windows_range_v3_helpers.h
<(src_loc)/platform/platform_audio.h
<(src_loc)/platform/platform_file_utilities.h
<(src_loc)/platform/platform_launcher.h

View File

@ -55,7 +55,7 @@ Open **x86 Native Tools Command Prompt for VS 2017.bat**, go to ***BuildPath***
mkdir Libraries
cd Libraries
git clone https://github.com/Microsoft/Range-V3-VS2015 range-v3
git clone https://github.com/ericniebler/range-v3 range-v3
git clone https://github.com/telegramdesktop/lzma.git
cd lzma\C\Util\LzmaLib