Mercurial > mxe-octave

changeset 3277:1418183e786b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable native mingw build of gl2ps * src/gl2ps.mk: In native mingw, force output for MSYS makefiles and dont set AR, RANLIB.
author John Donoghue <john.donoghue@ieee.org>
date Sat, 02 Nov 2013 11:30:58 -0400
parents 7a7d2318ca93
children fbf8f71bf1e6
files src/gl2ps.mk
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gl2ps.mk	Wed Oct 30 02:23:16 2013 -0400
+++ b/src/gl2ps.mk	Sat Nov 02 11:30:58 2013 -0400
@@ -8,6 +8,15 @@
 $(PKG)_URL      := http://geuz.org/$(PKG)/src/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
+
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+    $(PKG)_CMAKE_FLAGS := -G 'MSYS Makefiles'
+else
+    $(PKG)_CMAKE_FLAGS := \
+        -DCMAKE_AR='$(MXE_AR)' \
+        -DCMAKE_RANLIB='$(MXE_RANLIB)' 
+endif
+
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
     echo $(gl2ps_VERSION)
@@ -15,9 +24,8 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && cmake \
+        $($(PKG)_CMAKE_FLAGS) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        -DCMAKE_AR='$(MXE_AR)' \
-        -DCMAKE_RANLIB='$(MXE_RANLIB)' \
         .
     $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 install
 endef