[OMPT-svn-commit] OpenMPT r21250 - in branches/OpenMPT-1.31: . build/android_ndk

[<sv...@op...>]

Author: manx
Date: Mon Jul 22 20:49:10 2024
New Revision: 21250
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21250

Log:
Merged revision(s) 21246 from trunk/OpenMPT:
[Imp] build: Android: Enable C++20 if available.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/build/android_ndk/Android.mk

Modified: branches/OpenMPT-1.31/build/android_ndk/Android.mk
==============================================================================
--- branches/OpenMPT-1.31/build/android_ndk/Android.mk	Mon Jul 22 20:27:16 2024	(r21249)
+++ branches/OpenMPT-1.31/build/android_ndk/Android.mk	Mon Jul 22 20:49:10 2024	(r21250)
@@ -6,8 +6,45 @@
 
 LOCAL_MODULE := openmpt
 
+ifeq ($(NDK_MAJOR),)
 LOCAL_CFLAGS   += -std=c17
-LOCAL_CPPFLAGS += -std=c++17 -fexceptions -frtti
+LOCAL_CPPFLAGS += -std=c++17
+else
+ifeq ($(NDK_MAJOR),21)
+# clang 9
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++17
+else ifeq ($(NDK_MAJOR),22)
+# clang 11
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++20
+else ifeq ($(NDK_MAJOR),23)
+# clang 12
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++20
+else ifeq ($(NDK_MAJOR),24)
+# clang 14
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++20
+else ifeq ($(NDK_MAJOR),25)
+# clang 14
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++20
+else ifeq ($(NDK_MAJOR),26)
+# clang 17
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++20
+else ifeq ($(NDK_MAJOR),27)
+# clang 18
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++20
+else
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++20
+endif
+endif
+
+LOCAL_CPPFLAGS += -fexceptions -frtti
 
 LOCAL_CPP_FEATURES += exceptions rtti