[vlc-commits] contrib: add generic meson support

Steve Lhomme git at videolan.org
Tue Dec 18 18:14:33 CET 2018


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Oct 24 10:25:27 2018 +0200| [6cc3091d5fb835140687543b2c2f13937a9b0480] | committer: Hugo Beauzée-Luyssen

contrib: add generic meson support

to differentiate optimized and debug builds

Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit 868f1cc977234ecd210ef153d5612000c6379662)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

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

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 805b7db90b..91c40d6f75 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -348,6 +348,16 @@ RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
 CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
 		-DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_GENERATOR)
 
+MESON = meson --default-library static --prefix "$(PREFIX)" --backend ninja \
+	-Dlibdir=lib
+ifndef WITH_OPTIMIZATION
+MESON += --buildtype debug
+else
+MESON += --buildtype release
+endif
+
+
+
 ifdef GPL
 REQUIRE_GPL =
 else



More information about the vlc-commits mailing list