Merge pull request #3875 from withSang/develop

Fix c++ flags for Java / Android
rism-digital · Dec 4, 2024 · bb23ff1 · bb23ff1
2 parents 685bedb + a959498
commit bb23ff1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)