From 990d27f4f94e4254d143819f8a492c4abdab7a17 Mon Sep 17 00:00:00 2001 From: Marshall Mohror Date: Thu, 20 Feb 2020 09:04:37 -0600 Subject: [PATCH 1/2] Remove C++ standard flag --- src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a4c39f17..33d7400fa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,7 +38,6 @@ if (MSVC) /Zo /permissive- /EHsc - /std:c++latest /volatile:iso /Zc:externConstexpr /Zc:inline From 670119ef86a5053b3a25a17b5c369d3cd2bd5dfd Mon Sep 17 00:00:00 2001 From: BreadFish64 Date: Fri, 21 Feb 2020 16:47:04 -0600 Subject: [PATCH 2/2] android: use cmake 3.10 bitrise still doesn't have 3.10 despite it being part of the NDK now --- bitrise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index e6ab3d22d..d5a5cb1ab 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -52,7 +52,7 @@ workflows: sudo apt remove cmake -y sudo apt purge --auto-remove cmake -y sudo apt install ninja-build -y - version=3.8 + version=3.10 build=2 mkdir ~/temp cd ~/temp @@ -97,7 +97,7 @@ workflows: sudo apt remove cmake -y sudo apt purge --auto-remove cmake -y sudo apt install ninja-build -y - version=3.8 + version=3.10 build=2 mkdir ~/temp cd ~/temp