Mercurial > mxe-octave
diff Makefile.in @ 3851:c55d9f182272
use MXE_XXXX tools for octave qt compiling (Bug 44563)
* Makefile.in: add cross/native MXE_UIC,MOC,LRELEASE,RCC variables where missing
* src/octave.mk, src/default-octave.mk, src/stable-octave.mk: use MXE_XXX qt tools
author | John Donoghue |
---|---|
date | Tue, 17 Mar 2015 16:03:03 -0400 |
parents | 938fb37b9c62 |
children | 58935b4de51f |
line wrap: on
line diff
--- a/Makefile.in Sat Mar 07 14:07:33 2015 -0500 +++ b/Makefile.in Tue Mar 17 16:03:03 2015 -0400 @@ -305,8 +305,10 @@ MXE_QMAKE := qmake endif - MXE_MOC := moc - MXE_UIC := uic + MXE_MOC := $(HOST_BINDIR)/moc + MXE_UIC := $(HOST_BINDIR)/uic + MXE_LRELEASE := $(HOST_BINDIR)/lrelease + MXE_RCC := $(HOST_BINDIR)/rcc else MXE_TOOL_PREFIX := $(TARGET)- MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar' @@ -327,6 +329,8 @@ 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' + MXE_LRELEASE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease' + MXE_RCC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc' endif ifeq ($(MXE_SYSTEM),mingw)