Mercurial > mxe-octave

comparison src/default-octave.mk @ 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 e50c777c9a97
children a781fda0a9c6
comparison
equal deleted inserted replaced
3850:e8571962313f 3851:c55d9f182272
42 endif 42 endif
43 43
44 ## If we allow the system Qt libraries to be used, then these 44 ## If we allow the system Qt libraries to be used, then these
45 ## won't make sense. 45 ## won't make sense.
46 $(PKG)_QT_CONFIGURE_OPTIONS := \ 46 $(PKG)_QT_CONFIGURE_OPTIONS := \
47 MOC=$(HOST_BINDIR)/moc \ 47 MOC=$(MXE_MOC) \
48 UIC=$(HOST_BINDIR)/uic \ 48 UIC=$(MXE_UIC) \
49 RCC=$(HOST_BINDIR)/rcc \ 49 RCC=$(MXE_RCC) \
50 LRELEASE=$(HOST_BINDIR)/lrelease 50 LRELEASE=$(MXE_LRELEASE)
51 51
52 ifneq ($(ENABLE_DOCS),yes) 52 ifneq ($(ENABLE_DOCS),yes)
53 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs 53 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
54 endif 54 endif
55 55