Apply some rlottie fixes.

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

@ -1 +1 @@
Subproject commit d08a03b6508b390af20491f2dbeee3453594afc8
Subproject commit 589db026ec211bc4979e3bffe074f6e48ce7cedc

View File

@ -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,

View File

@ -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',

View File

@ -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.