Migrate to VS2017.

This commit is contained in:
John Preston 2017-09-05 20:46:16 +03:00
parent 13aa42c883
commit 7ae1ef0a1a
9 changed files with 23 additions and 24 deletions

1
.gitignore vendored
View file

@ -34,6 +34,7 @@
*.xcodeproj *.xcodeproj
/Win32/ /Win32/
ipch/ ipch/
.vs/
/Telegram/log.txt /Telegram/log.txt
/Telegram/data /Telegram/data

View file

@ -29,7 +29,7 @@ namespace assertion {
void log(const char *message, const char *file, int line); void log(const char *message, const char *file, int line);
// Release build assertions. // Release build assertions.
inline void noop() { inline constexpr void noop() {
} }
[[noreturn]] inline void fail(const char *message, const char *file, int line) { [[noreturn]] inline void fail(const char *message, const char *file, int line) {
@ -43,7 +43,7 @@ inline void noop() {
std::abort(); std::abort();
} }
inline void validate(bool condition, const char *message, const char *file, int line) { inline constexpr void validate(bool condition, const char *message, const char *file, int line) {
(GSL_UNLIKELY(!(condition))) ? fail(message, file, line) : noop(); (GSL_UNLIKELY(!(condition))) ? fail(message, file, line) : noop();
} }

View file

@ -695,7 +695,7 @@ private:
SendTyping = (1 << 1), SendTyping = (1 << 1),
}; };
using TextUpdateEvents = base::flags<TextUpdateEvent>; using TextUpdateEvents = base::flags<TextUpdateEvent>;
friend inline constexpr auto is_flag_type(TextUpdateEvent) { return true; }; friend inline constexpr bool is_flag_type(TextUpdateEvent) { return true; };
void writeDrafts(Data::Draft **localDraft, Data::Draft **editDraft); void writeDrafts(Data::Draft **localDraft, Data::Draft **editDraft);
void writeDrafts(History *history); void writeDrafts(History *history);

@ -1 +1 @@
Subproject commit 757a5d8ec31aadcf387ac3cb135256152c18de1c Subproject commit 9f78cb85e5db9b39a6c4c3f7847ea3e98c9f544a

View file

@ -98,7 +98,7 @@
'<(libs_loc)/breakpad/src', '<(libs_loc)/breakpad/src',
'<(libs_loc)/lzma/C', '<(libs_loc)/lzma/C',
'<(libs_loc)/libexif-0.6.20', '<(libs_loc)/libexif-0.6.20',
'<(libs_loc)/zlib-1.2.8', '<(libs_loc)/zlib',
'<(libs_loc)/ffmpeg', '<(libs_loc)/ffmpeg',
'<(libs_loc)/openal-soft/include', '<(libs_loc)/openal-soft/include',
'<(libs_loc)/opus/include', '<(libs_loc)/opus/include',

View file

@ -25,7 +25,7 @@ if not "%TDESKTOP_BUILD_DEFINES%" == "" (
echo [INFO] Set build defines to !BUILD_DEFINES! echo [INFO] Set build defines to !BUILD_DEFINES!
) )
set GYP_MSVS_VERSION=2015 set GYP_MSVS_VERSION=2017
cd "%FullScriptPath%" cd "%FullScriptPath%"
call gyp --depth=. --generator-output=.. -Goutput_dir=../out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=ninja call gyp --depth=. --generator-output=.. -Goutput_dir=../out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=ninja

View file

@ -40,6 +40,7 @@
'/MP', # Enable multi process build. '/MP', # Enable multi process build.
'/EHsc', # Catch C++ exceptions only, extern C functions never throw a C++ exception. '/EHsc', # Catch C++ exceptions only, extern C functions never throw a C++ exception.
'/WX', # Treat warnings as errors. '/WX', # Treat warnings as errors.
'/std:c++latest',
], ],
'TreatWChar_tAsBuiltInType': 'false', 'TreatWChar_tAsBuiltInType': 'false',
}, },

View file

@ -21,7 +21,7 @@
'conditions': [[ 'build_win', { 'conditions': [[ 'build_win', {
'msvs_precompiled_source': '<(src_loc)/stdafx.cpp', 'msvs_precompiled_source': '<(src_loc)/stdafx.cpp',
'msvs_precompiled_header': '<(src_loc)/stdafx.h', 'msvs_precompiled_header': '<(src_loc)/stdafx.h',
'msbuild_toolset': 'v140', 'msbuild_toolset': 'v141',
'sources': [ 'sources': [
'<(res_loc)/winrc/Telegram.rc', '<(res_loc)/winrc/Telegram.rc',
], ],
@ -36,13 +36,12 @@
'-lLzmaLib', '-lLzmaLib',
'-lUxTheme', '-lUxTheme',
'-lDbgHelp', '-lDbgHelp',
'-llib_exif',
'-lOpenAL32', '-lOpenAL32',
'-lcommon', '-lcommon',
'-lopus', '-lopus',
'lib/common', 'windows/common',
'lib/exception_handler', 'windows/handler/exception_handler',
'lib/crash_generation_client', 'windows/crash_generation/crash_generation_client',
], ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
@ -58,16 +57,15 @@
'configurations': { 'configurations': {
'Debug': { 'Debug': {
'include_dirs': [ 'include_dirs': [
'<(libs_loc)/openssl_debug/Debug/include', '<(libs_loc)/openssl/Debug/include',
], ],
'library_dirs': [ 'library_dirs': [
'<(libs_loc)/openssl_debug/Debug/lib', '<(libs_loc)/openssl/Debug/lib',
'<(libs_loc)/lzma/C/Util/LzmaLib/Debug', '<(libs_loc)/lzma/C/Util/LzmaLib/Debug',
'<(libs_loc)/libexif-0.6.20/win32/Debug',
'<(libs_loc)/opus/win32/VS2015/Win32/Debug', '<(libs_loc)/opus/win32/VS2015/Win32/Debug',
'<(libs_loc)/openal-soft/build/Debug', '<(libs_loc)/openal-soft/build/Debug',
'<(libs_loc)/zlib-1.2.8/contrib/vstudio/vc11/x86/ZlibStatDebug', '<(libs_loc)/zlib/contrib/vstudio/vc14/x86/ZlibStatDebug',
'<(libs_loc)/breakpad/src/client/windows/Debug', '<(libs_loc)/breakpad/src/out/Debug/obj/client',
], ],
}, },
'Release': { 'Release': {
@ -77,11 +75,10 @@
'library_dirs': [ 'library_dirs': [
'<(libs_loc)/openssl/Release/lib', '<(libs_loc)/openssl/Release/lib',
'<(libs_loc)/lzma/C/Util/LzmaLib/Release', '<(libs_loc)/lzma/C/Util/LzmaLib/Release',
'<(libs_loc)/libexif-0.6.20/win32/Release',
'<(libs_loc)/opus/win32/VS2015/Win32/Release', '<(libs_loc)/opus/win32/VS2015/Win32/Release',
'<(libs_loc)/openal-soft/build/Release', '<(libs_loc)/openal-soft/build/Release',
'<(libs_loc)/zlib-1.2.8/contrib/vstudio/vc11/x86/ZlibStatRelease', '<(libs_loc)/zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm',
'<(libs_loc)/breakpad/src/client/windows/Release', '<(libs_loc)/breakpad/src/out/Release/obj/client',
], ],
}, },
}, },

View file

@ -110,7 +110,7 @@
'include_dirs': [ 'include_dirs': [
'<(src_loc)', '<(src_loc)',
'<(libs_loc)/lzma/C', '<(libs_loc)/lzma/C',
'<(libs_loc)/zlib-1.2.8', '<(libs_loc)/zlib',
], ],
'sources': [ 'sources': [
'<(src_loc)/_other/packer.cpp', '<(src_loc)/_other/packer.cpp',
@ -121,12 +121,12 @@
'conditions': [ 'conditions': [
[ 'build_win', { [ 'build_win', {
'include_dirs': [ 'include_dirs': [
'<(libs_loc)/openssl_debug/Debug/include', '<(libs_loc)/openssl/Debug/include',
], ],
'library_dirs': [ 'library_dirs': [
'<(libs_loc)/openssl_debug/Debug/lib', '<(libs_loc)/openssl/Debug/lib',
'<(libs_loc)/lzma/C/Util/LzmaLib/Debug', '<(libs_loc)/lzma/C/Util/LzmaLib/Debug',
'<(libs_loc)/zlib-1.2.8/contrib/vstudio/vc11/x86/ZlibStatDebug', '<(libs_loc)/zlib/contrib/vstudio/vc14/x86/ZlibStatDebug',
], ],
}, { }, {
'include_dirs': [ 'include_dirs': [
@ -148,7 +148,7 @@
'library_dirs': [ 'library_dirs': [
'<(libs_loc)/openssl/Release/lib', '<(libs_loc)/openssl/Release/lib',
'<(libs_loc)/lzma/C/Util/LzmaLib/Release', '<(libs_loc)/lzma/C/Util/LzmaLib/Release',
'<(libs_loc)/zlib-1.2.8/contrib/vstudio/vc11/x86/ZlibStatRelease', '<(libs_loc)/zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm',
], ],
}, { }, {
'include_dirs': [ 'include_dirs': [