[vlc-commits] contrib: projectM/glew: Don't build projectM (and implicitly glew) when targeting windows on arm/aarch64

Martin Storsjö git at videolan.org
Sat Jun 20 21:29:40 CEST 2020


vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Tue Apr 10 22:53:50 2018 +0300| [b58a89ff64c4f593d07be48a1d9e9b09f7102b03] | committer: Martin Storsjö

contrib: projectM/glew: Don't build projectM (and implicitly glew) when targeting windows on arm/aarch64

OpenGL is unavailable on windows on these architectures.

(cherry picked from commit 85c8fa3f7fc41e7d76eb28422dbdec58a0df00c5)

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

 contrib/src/projectM/rules.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/projectM/rules.mak b/contrib/src/projectM/rules.mak
index 0502d0dbce..9674b25951 100644
--- a/contrib/src/projectM/rules.mak
+++ b/contrib/src/projectM/rules.mak
@@ -3,8 +3,12 @@ PROJECTM_VERSION := 2.0.1
 PROJECTM_URL := $(SF)/projectm/$(PROJECTM_VERSION)/projectM-$(PROJECTM_VERSION)-Source.tar.gz
 
 ifdef HAVE_WIN32
+ifneq ($(ARCH),arm)
+ifneq ($(ARCH),aarch64)
 PKGS += projectM
 endif
+endif
+endif
 ifeq ($(call need_pkg,"libprojectM"),)
 PKGS_FOUND += projectM
 endif



More information about the vlc-commits mailing list