From bff74452b75522ee5b78803aa7fb3682f546cb94 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 17 Feb 2017 15:15:24 +0300 Subject: [PATCH] Divided emoji resource file in two. Linux 32bit build cannot handle all the emoji sprites being compiled in a single translation unit, so now it is divided in two. --- .../Resources/{telegram_emojis.qrc => telegram_emoji.qrc} | 1 - Telegram/Resources/telegram_emoji_large.qrc | 5 +++++ Telegram/gyp/telegram_qrc.gypi | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) rename Telegram/Resources/{telegram_emojis.qrc => telegram_emoji.qrc} (84%) create mode 100644 Telegram/Resources/telegram_emoji_large.qrc diff --git a/Telegram/Resources/telegram_emojis.qrc b/Telegram/Resources/telegram_emoji.qrc similarity index 84% rename from Telegram/Resources/telegram_emojis.qrc rename to Telegram/Resources/telegram_emoji.qrc index cff8f5f21..9082b5167 100644 --- a/Telegram/Resources/telegram_emojis.qrc +++ b/Telegram/Resources/telegram_emoji.qrc @@ -4,6 +4,5 @@ art/emoji_125x.webp art/emoji_150x.webp art/emoji_200x.webp - art/emoji_250x.webp diff --git a/Telegram/Resources/telegram_emoji_large.qrc b/Telegram/Resources/telegram_emoji_large.qrc new file mode 100644 index 000000000..f7fc1b06a --- /dev/null +++ b/Telegram/Resources/telegram_emoji_large.qrc @@ -0,0 +1,5 @@ + + + art/emoji_250x.webp + + diff --git a/Telegram/gyp/telegram_qrc.gypi b/Telegram/gyp/telegram_qrc.gypi index 8a4096f71..1d40bf6e6 100644 --- a/Telegram/gyp/telegram_qrc.gypi +++ b/Telegram/gyp/telegram_qrc.gypi @@ -21,7 +21,8 @@ 'variables': { 'qrc_files': [ '<(res_loc)/telegram.qrc', - '<(res_loc)/telegram_emojis.qrc', + '<(res_loc)/telegram_emoji.qrc', + '<(res_loc)/telegram_emoji_large.qrc', ], }, 'conditions': [