hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 10:11:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build for Xcode 10.

Browse source
This commit is contained in:
John Preston 2018-09-18 13:43:14 +03:00
parent 62ffd93cb7
commit 377689ae86
7 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/calls/calls_call.cpp
View file

@ -119,6 +119,8 @@ Call::ControllerPointer::~ControllerPointer() {
reset(); reset();
} }
Call::Delegate::~Delegate() = default;
Call::Call( Call::Call(
not_null<Delegate*> delegate, not_null<Delegate*> delegate,
not_null<UserData*> user, not_null<UserData*> user,

2
Telegram/SourceFiles/calls/calls_call.h
View file

@ -47,6 +47,8 @@ public:
}; };
virtual void playSound(Sound sound) = 0; virtual void playSound(Sound sound) = 0;
virtual ~Delegate();
}; };
static constexpr auto kSoundSampleMs = 100; static constexpr auto kSoundSampleMs = 100;

4
Telegram/SourceFiles/rpl/variable.h
View file

@ -96,7 +96,7 @@ public:
std::is_assignable_v<Type&, OtherType>>> std::is_assignable_v<Type&, OtherType>>>
variable(producer<OtherType, Error, Generator> &&stream) { variable(producer<OtherType, Error, Generator> &&stream) {
std::move(stream) std::move(stream)
| start_with_next([this](auto &&data) { | start_with_next([=](auto &&data) {
assign(std::forward<decltype(data)>(data)); assign(std::forward<decltype(data)>(data));
}, _lifetime); }, _lifetime);
} }
@ -111,7 +111,7 @@ public:
producer<OtherType, Error, Generator> &&stream) { producer<OtherType, Error, Generator> &&stream) {
_lifetime.destroy(); _lifetime.destroy();
std::move(stream) std::move(stream)
| start_with_next([this](auto &&data) { | start_with_next([=](auto &&data) {
assign(std::forward<decltype(data)>(data)); assign(std::forward<decltype(data)>(data));
}, _lifetime); }, _lifetime);
return *this; return *this;

2
Telegram/ThirdParty/libtgvoip vendored

@ -1 +1 @@
Subproject commit 6053cf5dce58c12ef6ce2d2f6cbe77fd5b10c575 Subproject commit 9b292fdbc84f148f736407176facc920e20592f9

2
Telegram/gyp/refresh.sh
View file

@ -28,7 +28,7 @@ else
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode-ninja #gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode-ninja
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode #gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode
# use patched gyp with Xcode project generator # use patched gyp with Xcode project generator
../../../Libraries/gyp/gyp --depth=. --generator-output=.. -Goutput_dir=../out -Gxcode_upgrade_check_project_version=940 -Dofficial_build_target=$BuildTarget Telegram.gyp --format=xcode ../../../Libraries/gyp/gyp --depth=. --generator-output=.. -Goutput_dir=../out -Gxcode_upgrade_check_project_version=1000 -Dofficial_build_target=$BuildTarget Telegram.gyp --format=xcode
fi fi
cd ../.. cd ../..

1
Telegram/gyp/settings_mac.gypi
View file

@ -62,6 +62,7 @@
'CLANG_CXX_LANGUAGE_STANDARD': 'c++1z', 'CLANG_CXX_LANGUAGE_STANDARD': 'c++1z',
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
'ALWAYS_SEARCH_USER_PATHS': 'NO',
}, },
'configurations': { 'configurations': {
'Debug': { 'Debug': {

1
Telegram/gyp/telegram_mac.gypi
View file

@ -40,6 +40,7 @@
'xcode_settings': { 'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ], 'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
'OTHER_LDFLAGS': [ 'OTHER_LDFLAGS': [
'-isysroot', '/',
'-lbase', '-lbase',
'-lcrashpad_client', '-lcrashpad_client',
'-lcrashpad_util', '-lcrashpad_util',