Mercurial > mxe-octave

changeset 4520:0f62ac5c6fd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mesa: Don't depend on s2tc if using system OpenGL.
author John W. Eaton <jwe@octave.org>
date Fri, 27 Oct 2017 18:04:34 -0400
parents 58de4f56c797
children fc13ddea251c
files src/mesa.mk
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/mesa.mk	Thu Oct 19 17:11:27 2017 -0400
+++ b/src/mesa.mk	Fri Oct 27 18:04:34 2017 -0400
@@ -7,10 +7,11 @@
 $(PKG)_SUBDIR   := mesa-$($(PKG)_VERSION)
 $(PKG)_FILE     := mesa-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-mako s2tc zlib
+$(PKG)_DEPS     := build-mako zlib
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   ifeq ($(USE_SYSTEM_OPENGL),no)
     $(PKG)_SCONS_OPENGL_OPTIONS := libgl-gdi
+    $(PKG)_DEPS += s2tc
   endif
 else
   ifeq ($(USE_SYSTEM_OPENGL),yes)
@@ -27,7 +28,7 @@
     ifeq ($(USE_SYSTEM_X11_LIBS),no)
       $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes
     endif
-    $(PKG)_DEPS += llvm
+    $(PKG)_DEPS += llvm s2tc
   endif
 endif