mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 15:15:13 +00:00
Code Issues Releases Wiki Activity

Apply some rlottie fixes.

Browse Source
This commit is contained in:
John Preston
2019-09-02 13:37:37 +03:00
parent ab6d9ff73c
commit 056949416d
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/ThirdParty/rlottie vendored

Submodule Telegram/ThirdParty/rlottie updated: d08a03b650...589db026ec

2
Telegram/gyp/common.gypi
View File

@@ -47,12 +47,14 @@
'build_linux%': '<(build_linux)', 'build_linux%': '<(build_linux)',
'official_build_target%': '', 'official_build_target%': '',
'build_standard_win%': 'c++17',
}, },
'build_os%': '<(build_os)', 'build_os%': '<(build_os)',
'build_win%': '<(build_win)', 'build_win%': '<(build_win)',
'build_mac%': '<(build_mac)', 'build_mac%': '<(build_mac)',
'build_linux%': '<(build_linux)', 'build_linux%': '<(build_linux)',
'official_build_target%': '<(official_build_target)', 'official_build_target%': '<(official_build_target)',
'build_standard_win%': '<(build_standard_win)',
# GYP does not support per-configuration libraries :( # GYP does not support per-configuration libraries :(
# So they will be emulated through additional link flags, # So they will be emulated through additional link flags,

4
Telegram/gyp/lib_rlottie.gyp
View File

@@ -8,6 +8,9 @@
'includes': [ 'includes': [
'common.gypi', 'common.gypi',
], ],
'variables': {
'build_standard_win': 'c++14',
},
'targets': [{ 'targets': [{
'target_name': 'lib_rlottie', 'target_name': 'lib_rlottie',
'type': 'static_library', 'type': 'static_library',
@@ -17,6 +20,7 @@
], ],
'variables': { 'variables': {
'official_build_target%': '', 'official_build_target%': '',
'build_standard_win': 'c++14',
'submodules_loc': '../ThirdParty', 'submodules_loc': '../ThirdParty',
'libs_loc': '../../../Libraries', 'libs_loc': '../../../Libraries',
'rlottie_loc': '<(submodules_loc)/rlottie', 'rlottie_loc': '<(submodules_loc)/rlottie',

2
Telegram/gyp/settings_win.gypi
View File

@@ -25,7 +25,7 @@
'DebugInformationFormat': '3', # Program Database (/Zi) 'DebugInformationFormat': '3', # Program Database (/Zi)
'WarnAsError': 'true', 'WarnAsError': 'true',
'AdditionalOptions': [ 'AdditionalOptions': [
'/std:c++17', '/std:<(build_standard_win)',
'/permissive-', '/permissive-',
'/Qspectre', '/Qspectre',
'/MP', # Enable multi process build. '/MP', # Enable multi process build.