Mercurial > mxe-octave

diff src/qscintilla.mk @ 3746:0ef36efbd9cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt: for cross compile, move the native binaries to the builkd directory * src/qt.mk: instead of installing (TARGET-)qmake, moc,uic,lrease, move the binary to that name. * src/qscintilla.mk: use MXE_QMAKE, MXE_UIC, MXE_MOC. * Makefile.in: define vars MXE_UIC, MXE_MOC
author John Donoghue
date Wed, 26 Nov 2014 15:14:43 -0500
parents 2acaa9943159
children 774f488e33cd
line wrap: on
line diff
--- a/src/qscintilla.mk	Wed Nov 26 12:20:39 2014 -0500
+++ b/src/qscintilla.mk	Wed Nov 26 15:14:43 2014 -0500
@@ -34,7 +34,7 @@
 endif
 
 define $(PKG)_BUILD
-    cd '$(1)/Qt4Qt5' && '$(HOST_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION)
+    cd '$(1)/Qt4Qt5' && '$(MXE_QMAKE)' -makefile $($(PKG)_QMAKE_SPEC_OPTION) QMAKE_UIC=$(MXE_UIC) QMAKE_MOC=$(MXE_MOC)
 
     if [ $(MXE_SYSTEM) = msvc ]; then \
         mkdir -p '$(3)' && \