Mercurial > mxe-octave

comparison Makefile.in @ 3851:c55d9f182272

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3850:e8571962313f 3851:c55d9f182272
303 endif 303 endif
304 MXE_PKG_CONFIG := pkg-config 304 MXE_PKG_CONFIG := pkg-config
305 MXE_QMAKE := qmake 305 MXE_QMAKE := qmake
306 endif 306 endif
307 307
308 MXE_MOC := moc 308 MXE_MOC := $(HOST_BINDIR)/moc
309 MXE_UIC := uic 309 MXE_UIC := $(HOST_BINDIR)/uic
310 MXE_LRELEASE := $(HOST_BINDIR)/lrelease
311 MXE_RCC := $(HOST_BINDIR)/rcc
310 else 312 else
311 MXE_TOOL_PREFIX := $(TARGET)- 313 MXE_TOOL_PREFIX := $(TARGET)-
312 MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar' 314 MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar'
313 MXE_RANLIB := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ranlib' 315 MXE_RANLIB := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ranlib'
314 MXE_CC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gcc' 316 MXE_CC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gcc'
325 endif 327 endif
326 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config' 328 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config'
327 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' 329 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
328 MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' 330 MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
329 MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' 331 MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'
332 MXE_LRELEASE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'
333 MXE_RCC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'
330 endif 334 endif
331 335
332 ifeq ($(MXE_SYSTEM),mingw) 336 ifeq ($(MXE_SYSTEM),mingw)
333 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll 337 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll
334 endif 338 endif