[vlc-commits] contrib: main.mak: improve system name handling for meson

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Tue Nov 26 14:50:37 2019 +0100| [c29409d1a742e65b6b2f3c95702196ff9ab1570c] | committer: Thomas Guillem

contrib: main.mak: improve system name handling for meson

Set the host system name to android when running on android, like for
cmake buildsystem, and trigger an error whenever we compile for a
non-referenced platform instead of putting an empty string as system
name.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c29409d1a742e65b6b2f3c95702196ff9ab1570c
---

 contrib/src/main.mak | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index e0d8066ded..7d701626ba 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -634,9 +634,15 @@ else
 ifdef HAVE_DARWIN_OS
 	MESON_SYSTEM_NAME = darwin
 else
+ifdef HAVE_ANDROID
+	MESON_SYSTEM_NAME = android
+else
 ifdef HAVE_LINUX
 	# android has also system = linux and defines HAVE_LINUX
 	MESON_SYSTEM_NAME = linux
+else
+	$(error "No meson system name known for this target")
+endif
 endif
 endif
 endif