Mercurial > mxe-octave

diff src/qscintilla.mk @ 2997:4f9b72cf7ee7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow native builds too
author John W. Eaton <jwe@octave.org>
date Tue, 28 May 2013 17:31:59 -0400
parents 8cf0cbcdaeea
children 100e618349f7
line wrap: on
line diff
--- a/src/qscintilla.mk	Sun May 26 13:32:22 2013 -0400
+++ b/src/qscintilla.mk	Tue May 28 17:31:59 2013 -0400
@@ -14,10 +14,18 @@
     echo $(qscintilla_VERSION)
 endef
 
+ifneq ($(MXE_NATIVE_BUILD),yes)
+  ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_QMAKE_SPEC_OPTION := -spec '$(PREFIX)/$(TARGET)/mkspecs/win32-g++'
+  endif
+endif
+
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/bin/qmake' -makefile -spec '$(PREFIX)/$(TARGET)/mkspecs/win32-g++'
+    cd '$(1)' && '$(MXE_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION)
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
-    $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/qscintilla2.dll' '$(PREFIX)/$(TARGET)/bin/qscintilla2.dll'
+    if [ $(MXE_SYSTEM) = mingw ]; then \
+      $(INSTALL) -m755 '$(MXE_LIBDIR)/qscintilla2.dll' '$(MXE_BINDIR)/qscintilla2.dll'; \
+    fi
 endef