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

Fix build for Xcode. 

Regression was introduced in a8d35b67aa.
This commit is contained in:
John Preston 2018-07-11 00:19:52 +03:00
parent 9eb34e496f
commit 81e074115d
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/export/output/export_output_html.h
View File

@ -35,7 +35,7 @@ private:
}; };
struct UserpicData; struct UserpicData;
struct PeersMap; class PeersMap;
struct MediaData; struct MediaData;
} // namespace details } // namespace details

2
Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
View File

@ -463,7 +463,7 @@ void EditScans::setupSpecialScans(std::map<SpecialFile, ScanInfo> &&files) {
createSpecialScanRow(scan, scan.file, requiresBothSides); createSpecialScanRow(scan, scan.file, requiresBothSides);
} }
auto label = scan.rowCreated.value( auto label = scan.rowCreated.value(
) | rpl::map([=](bool created) { ) | rpl::map([=, type = type](bool created) {
return Lang::Viewer(uploadKey(type, created)); return Lang::Viewer(uploadKey(type, created));
}) | rpl::flatten_latest( }) | rpl::flatten_latest(
) | Info::Profile::ToUpperValue(); ) | Info::Profile::ToUpperValue();

6
Telegram/gyp/Telegram.gyp
View File

@ -124,6 +124,12 @@
'dependencies': [ 'dependencies': [
'utils.gyp:Packer', 'utils.gyp:Packer',
], ],
}], [ 'build_mac', {
'mac_bundle': '1',
'mac_bundle_resources': [
'<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")',
'../Telegram/Images.xcassets',
],
}], }],
], ],
}], }],

5
Telegram/gyp/telegram_mac.gypi
View File

@ -36,11 +36,6 @@
}, },
}, },
}, },
'mac_bundle': '1',
'mac_bundle_resources': [
'<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")',
'../Telegram/Images.xcassets',
],
}], [ 'build_macold', { }], [ 'build_macold', {
'xcode_settings': { 'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ], 'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],