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

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

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

Log:
Merged revision(s) 21253 from trunk/OpenMPT:
[Fix] build: Android: Also enable C++20 in Application.mk.
........

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

Modified: branches/OpenMPT-1.31/build/android_ndk/Application.mk
==============================================================================
--- branches/OpenMPT-1.31/build/android_ndk/Application.mk	Mon Jul 22 21:09:12 2024	(r21253)
+++ branches/OpenMPT-1.31/build/android_ndk/Application.mk	Mon Jul 22 21:09:41 2024	(r21254)
@@ -1,6 +1,42 @@
 
+ifeq ($(NDK_MAJOR),)
 APP_CFLAGS   := -std=c17
 APP_CPPFLAGS := -std=c++17 -fexceptions -frtti
+else
+ifeq ($(NDK_MAJOR),21)
+# clang 9
+APP_CFLAGS   := -std=c17
+APP_CPPFLAGS := -std=c++17 -fexceptions -frtti
+else ifeq ($(NDK_MAJOR),22)
+# clang 11
+APP_CFLAGS   := -std=c17
+APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
+else ifeq ($(NDK_MAJOR),23)
+# clang 12
+APP_CFLAGS   := -std=c17
+APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
+else ifeq ($(NDK_MAJOR),24)
+# clang 14
+APP_CFLAGS   := -std=c17
+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
+else ifeq ($(NDK_MAJOR),26)
+# clang 17
+APP_CFLAGS   := -std=c17
+APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
+else ifeq ($(NDK_MAJOR),27)
+# clang 18
+APP_CFLAGS   := -std=c17
+APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
+else
+APP_CFLAGS   := -std=c17
+APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
+endif
+endif
+
 APP_LDFLAGS  := 
 APP_STL      := c++_shared