[OMPT-svn-commit] OpenMPT r21257 - trunk/OpenMPT/build/android_ndk

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

Author: manx
Date: Tue Jul 23 07:37:43 2024
New Revision: 21257
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21257

Log:
[Fix build: Android: LLVM and Clang versions are just random numbers in Android NDK. r25 and r26 do not support C++23.

Modified:
   trunk/OpenMPT/build/android_ndk/Android.mk
   trunk/OpenMPT/build/android_ndk/Application.mk

Modified: trunk/OpenMPT/build/android_ndk/Android.mk
==============================================================================
--- trunk/OpenMPT/build/android_ndk/Android.mk	Mon Jul 22 22:52:42 2024	(r21256)
+++ trunk/OpenMPT/build/android_ndk/Android.mk	Tue Jul 23 07:37:43 2024	(r21257)
@@ -29,11 +29,11 @@
 else ifeq ($(NDK_MAJOR),25)
 # clang 14
 LOCAL_CFLAGS   += -std=c18
-LOCAL_CPPFLAGS += -std=c++23
+LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),26)
 # clang 17
 LOCAL_CFLAGS   += -std=c18
-LOCAL_CPPFLAGS += -std=c++23
+LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),27)
 # clang 18
 LOCAL_CFLAGS   += -std=c23

Modified: trunk/OpenMPT/build/android_ndk/Application.mk
==============================================================================
--- trunk/OpenMPT/build/android_ndk/Application.mk	Mon Jul 22 22:52:42 2024	(r21256)
+++ trunk/OpenMPT/build/android_ndk/Application.mk	Tue Jul 23 07:37:43 2024	(r21257)
@@ -22,11 +22,11 @@
 else ifeq ($(NDK_MAJOR),25)
 # clang 14
 APP_CFLAGS   := -std=c18
-APP_CPPFLAGS := -std=c++23 -fexceptions -frtti
+APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),26)
 # clang 17
 APP_CFLAGS   := -std=c18
-APP_CPPFLAGS := -std=c++23 -fexceptions -frtti
+APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),27)
 # clang 18
 APP_CFLAGS   := -std=c23