diff src/s2tc.mk @ 4512:859c456e1257

s2tc: enable Windows build.
author John W. Eaton <jwe@octave.org>
date Wed, 18 Oct 2017 09:27:04 -0400
parents 4c645e979279
children e575e2afdae4
line wrap: on
line diff
--- a/src/s2tc.mk	Mon Oct 16 18:04:56 2017 -0400
+++ b/src/s2tc.mk	Wed Oct 18 09:27:04 2017 -0400
@@ -10,19 +10,21 @@
 $(PKG)_URL      := https://github.com/divVerent/s2tc/archive/v$($(PKG)_VERSION).zip
 $(PKG)_DEPS     := 
 
-ifeq ($(MXE_WINDOWS_BUILD),yes)
-  define $(PKG)_BUILD
-  endef
-else
-  define $(PKG)_BUILD
-    cd '$(1)' && ./autogen.sh
-    mkdir '$(1)/.build'
-    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
-        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        --prefix='$(HOST_PREFIX)' \
-        && $(CONFIGURE_POST_HOOK)
+define $(PKG)_BUILD
+  cd '$(1)' && ./autogen.sh
+  mkdir '$(1)/.build'
+  cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+      $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+      $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+      $(ENABLE_SHARED_OR_STATIC) \
+      --prefix='$(HOST_PREFIX)' \
+      --disable-tools \
+      && $(CONFIGURE_POST_HOOK)
 
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
-  endef
-endif
+  $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+
+  ## Mesa attempts to dynamically load dxtn.dll on Windows systems.
+  if [ $(MXE_WINDOWS_BUILD) = yes ]; then \
+    mv '$(3)$(HOST_BINDIR)/libtxc_dxtn-0.dll' '$(3)$(HOST_BINDIR)/dxtn.dll'; \
+  fi
+endef