Mercurial > mxe-octave
diff Makefile.in @ 3746:0ef36efbd9cd
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 | 14869a85249d |
children | 02990526ae69 |
line wrap: on
line diff
--- a/Makefile.in Wed Nov 26 12:20:39 2014 -0500 +++ b/Makefile.in Wed Nov 26 15:14:43 2014 -0500 @@ -300,6 +300,9 @@ MXE_PKG_CONFIG := pkg-config MXE_QMAKE := qmake endif + + MXE_MOC := moc + MXE_UIC := uic else MXE_TOOL_PREFIX := $(TARGET)- MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar' @@ -318,6 +321,8 @@ endif MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config' MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' + MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' + MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' endif ifeq ($(MXE_SYSTEM),mingw)