RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

4
Telegram/SourceFiles/base/assertion.h
View File

@ -29,7 +29,7 @@ namespace assertion {
void log(const char *message, const char *file, int line);
// Release build assertions.
inline void noop() {
inline constexpr void noop() {
}
[[noreturn]] inline void fail(const char *message, const char *file, int line) {
@ -43,7 +43,7 @@ inline void noop() {
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();
}

2
Telegram/SourceFiles/history/history_widget.h
View File

@ -695,7 +695,7 @@ private:
SendTyping = (1 << 1),
};
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(History *history);

2
Telegram/ThirdParty/libtgvoip vendored

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

2
Telegram/gyp/Telegram.gyp
View File

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

2
Telegram/gyp/refresh.bat
View File

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

1
Telegram/gyp/settings_win.gypi
View File

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

23
Telegram/gyp/telegram_win.gypi
View File

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

10
Telegram/gyp/utils.gyp
View File

@ -110,7 +110,7 @@
'include_dirs': [
'<(src_loc)',
'<(libs_loc)/lzma/C',
'<(libs_loc)/zlib-1.2.8',
'<(libs_loc)/zlib',
],
'sources': [
'<(src_loc)/_other/packer.cpp',
@ -121,12 +121,12 @@
'conditions': [
[ 'build_win', {
'include_dirs': [
'<(libs_loc)/openssl_debug/Debug/include',
'<(libs_loc)/openssl/Debug/include',
],
'library_dirs': [
'<(libs_loc)/openssl_debug/Debug/lib',
'<(libs_loc)/openssl/Debug/lib',
'<(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': [
@ -148,7 +148,7 @@
'library_dirs': [
'<(libs_loc)/openssl/Release/lib',
'<(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': [