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

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

Author: manx
Date: Mon Jul 22 21:12:48 2024
New Revision: 21255
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21255

Log:
[Imp] build: Android: Enable C++23 and C23 if available. Fixes <https://bugs.openmpt.org/view.php?id=1803> partially.

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 21:09:41 2024	(r21254)
+++ trunk/OpenMPT/build/android_ndk/Android.mk	Mon Jul 22 21:12:48 2024	(r21255)
@@ -7,40 +7,40 @@
 LOCAL_MODULE := openmpt
 
 ifeq ($(NDK_MAJOR),)
-LOCAL_CFLAGS   += -std=c17
+LOCAL_CFLAGS   += -std=c18
 LOCAL_CPPFLAGS += -std=c++17
 else
 ifeq ($(NDK_MAJOR),21)
 # clang 9
-LOCAL_CFLAGS   += -std=c17
+LOCAL_CFLAGS   += -std=c18
 LOCAL_CPPFLAGS += -std=c++17
 else ifeq ($(NDK_MAJOR),22)
 # clang 11
-LOCAL_CFLAGS   += -std=c17
+LOCAL_CFLAGS   += -std=c18
 LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),23)
 # clang 12
-LOCAL_CFLAGS   += -std=c17
+LOCAL_CFLAGS   += -std=c18
 LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),24)
 # clang 14
-LOCAL_CFLAGS   += -std=c17
+LOCAL_CFLAGS   += -std=c18
 LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),25)
 # clang 14
-LOCAL_CFLAGS   += -std=c17
-LOCAL_CPPFLAGS += -std=c++20
+LOCAL_CFLAGS   += -std=c18
+LOCAL_CPPFLAGS += -std=c++23
 else ifeq ($(NDK_MAJOR),26)
 # clang 17
-LOCAL_CFLAGS   += -std=c17
-LOCAL_CPPFLAGS += -std=c++20
+LOCAL_CFLAGS   += -std=c18
+LOCAL_CPPFLAGS += -std=c++23
 else ifeq ($(NDK_MAJOR),27)
 # clang 18
-LOCAL_CFLAGS   += -std=c17
-LOCAL_CPPFLAGS += -std=c++20
+LOCAL_CFLAGS   += -std=c23
+LOCAL_CPPFLAGS += -std=c++23
 else
-LOCAL_CFLAGS   += -std=c17
-LOCAL_CPPFLAGS += -std=c++20
+LOCAL_CFLAGS   += -std=c23
+LOCAL_CPPFLAGS += -std=c++23
 endif
 endif
 

Modified: trunk/OpenMPT/build/android_ndk/Application.mk
==============================================================================
--- trunk/OpenMPT/build/android_ndk/Application.mk	Mon Jul 22 21:09:41 2024	(r21254)
+++ trunk/OpenMPT/build/android_ndk/Application.mk	Mon Jul 22 21:12:48 2024	(r21255)
@@ -1,39 +1,39 @@
 
 ifeq ($(NDK_MAJOR),)
-APP_CFLAGS   := -std=c17
+APP_CFLAGS   := -std=c18
 APP_CPPFLAGS := -std=c++17 -fexceptions -frtti
 else
 ifeq ($(NDK_MAJOR),21)
 # clang 9
-APP_CFLAGS   := -std=c17
+APP_CFLAGS   := -std=c18
 APP_CPPFLAGS := -std=c++17 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),22)
 # clang 11
-APP_CFLAGS   := -std=c17
+APP_CFLAGS   := -std=c18
 APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),23)
 # clang 12
-APP_CFLAGS   := -std=c17
+APP_CFLAGS   := -std=c18
 APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),24)
 # clang 14
-APP_CFLAGS   := -std=c17
+APP_CFLAGS   := -std=c18
 APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),25)
 # clang 14
-APP_CFLAGS   := -std=c17
-APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
+APP_CFLAGS   := -std=c18
+APP_CPPFLAGS := -std=c++23 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),26)
 # clang 17
-APP_CFLAGS   := -std=c17
-APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
+APP_CFLAGS   := -std=c18
+APP_CPPFLAGS := -std=c++23 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),27)
 # clang 18
-APP_CFLAGS   := -std=c17
-APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
+APP_CFLAGS   := -std=c23
+APP_CPPFLAGS := -std=c++23 -fexceptions -frtti
 else
-APP_CFLAGS   := -std=c17
-APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
+APP_CFLAGS   := -std=c23
+APP_CPPFLAGS := -std=c++23 -fexceptions -frtti
 endif
 endif