From 056949416d32793d7472dfc20b75a5ac4dc80344 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Sep 2019 13:37:37 +0300
Subject: [PATCH] Apply some rlottie fixes.

---
 Telegram/ThirdParty/rlottie    | 2 +-
 Telegram/gyp/common.gypi       | 2 ++
 Telegram/gyp/lib_rlottie.gyp   | 4 ++++
 Telegram/gyp/settings_win.gypi | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Telegram/ThirdParty/rlottie b/Telegram/ThirdParty/rlottie
index d08a03b65..589db026e 160000
--- a/Telegram/ThirdParty/rlottie
+++ b/Telegram/ThirdParty/rlottie
@@ -1 +1 @@
-Subproject commit d08a03b6508b390af20491f2dbeee3453594afc8
+Subproject commit 589db026ec211bc4979e3bffe074f6e48ce7cedc
diff --git a/Telegram/gyp/common.gypi b/Telegram/gyp/common.gypi
index eb90fe275..a4e240cfd 100644
--- a/Telegram/gyp/common.gypi
+++ b/Telegram/gyp/common.gypi
@@ -47,12 +47,14 @@
       'build_linux%': '<(build_linux)',
 
       'official_build_target%': '',
+      'build_standard_win%': 'c++17',
     },
     'build_os%': '<(build_os)',
     'build_win%': '<(build_win)',
     'build_mac%': '<(build_mac)',
     'build_linux%': '<(build_linux)',
     'official_build_target%': '<(official_build_target)',
+    'build_standard_win%': '<(build_standard_win)',
 
     # GYP does not support per-configuration libraries :(
     # So they will be emulated through additional link flags,
diff --git a/Telegram/gyp/lib_rlottie.gyp b/Telegram/gyp/lib_rlottie.gyp
index eb519cc95..b3e117849 100644
--- a/Telegram/gyp/lib_rlottie.gyp
+++ b/Telegram/gyp/lib_rlottie.gyp
@@ -8,6 +8,9 @@
   'includes': [
     'common.gypi',
   ],
+  'variables': {
+    'build_standard_win': 'c++14',
+  },
   'targets': [{
     'target_name': 'lib_rlottie',
     'type': 'static_library',
@@ -17,6 +20,7 @@
     ],
     'variables': {
       'official_build_target%': '',
+      'build_standard_win': 'c++14',
       'submodules_loc': '../ThirdParty',
       'libs_loc': '../../../Libraries',
       'rlottie_loc': '<(submodules_loc)/rlottie',
diff --git a/Telegram/gyp/settings_win.gypi b/Telegram/gyp/settings_win.gypi
index 86b0925ed..3d2c779c5 100644
--- a/Telegram/gyp/settings_win.gypi
+++ b/Telegram/gyp/settings_win.gypi
@@ -25,7 +25,7 @@
           'DebugInformationFormat': '3',          # Program Database (/Zi)
           'WarnAsError': 'true',
           'AdditionalOptions': [
-            '/std:c++17',
+            '/std:<(build_standard_win)',
             '/permissive-',
             '/Qspectre',
             '/MP',     # Enable multi process build.