From a959498f280498d514b6b990472fbdc77e1ccba4 Mon Sep 17 00:00:00 2001 From: withSang Date: Wed, 4 Dec 2024 20:13:59 +0900 Subject: [PATCH] Fix c++ flags for Java / Android --- bindings/android/jni/Application.mk | 2 +- bindings/java/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/android/jni/Application.mk b/bindings/android/jni/Application.mk index 4ed813e6bfe..c57e6beb958 100755 --- a/bindings/android/jni/Application.mk +++ b/bindings/android/jni/Application.mk @@ -1,6 +1,6 @@ # only build armeabi-v7a, if required add 'armeabi' or 'x86' APP_ABI := armeabi-v7a -APP_CPPFLAGS += -fexceptions -frtti -std=c++17 +APP_CPPFLAGS += -fexceptions -frtti -std=c++20 APP_OPTIM := release APP_STL := c++_shared APP_MODULES := verovio-android diff --git a/bindings/java/build.sh b/bindings/java/build.sh index 37b6c01435d..6b9e72c0f5f 100755 --- a/bindings/java/build.sh +++ b/bindings/java/build.sh @@ -24,7 +24,7 @@ FILES="$SRCFILES \ ../../src/json/jsonxx.cc \ ../../src/crc/crc.cpp" -CXXOPTS="-g -fpic -std=c++17 -I../../include -I../../include/vrv -I../../include/json -I../../include/hum -I../../include/crc -I../../include/midi -I../../include/pugi -I../../include/zip -I../../libmei/addons -I../../libmei/dist -I/opt/local/include/ " +CXXOPTS="-g -fpic -std=c++20 -I../../include -I../../include/vrv -I../../include/json -I../../include/hum -I../../include/crc -I../../include/midi -I../../include/pugi -I../../include/zip -I../../libmei/addons -I../../libmei/dist -I/opt/local/include/ " PATHS="" unamestr=$(uname)