Mercurial > mxe-octave
changeset 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 | e3c3beae094b |
children | cae03f269f78 |
files | Makefile.in src/qscintilla.mk src/qt.mk |
diffstat | 3 files changed, 11 insertions(+), 6 deletions(-) [+] |
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)
--- 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)' && \
--- a/src/qt.mk Wed Nov 26 12:20:39 2014 -0500 +++ b/src/qt.mk Wed Nov 26 15:14:43 2014 -0500 @@ -206,16 +206,16 @@ $(if $(filter-out msvc, $(MXE_SYSTEM)), $(if $(filter-out yes, $(MXE_NATIVE_BUILD)), $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin' - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/moc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/rcc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc' - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/uic' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/qmake' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/moc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/rcc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc' + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/uic' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/qmake' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' ) # lrelease (from linguist) needed by octave for GUI build $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' $(MAKE) -C '$(1)/tools/linguist/lrelease' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)' $(if $(filter-out yes, $(MXE_NATIVE_BUILD)), - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/lrelease' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease')) + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/lrelease' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease')) endef