Mercurial > mxe-octave

comparison src/qscintilla.mk @ 3746:0ef36efbd9cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2acaa9943159
children 774f488e33cd
comparison
equal deleted inserted replaced
3745:e3c3beae094b 3746:0ef36efbd9cd
32 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_LIBDIR)/qt4/mkspecs/win32-msvc2010' 32 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_LIBDIR)/qt4/mkspecs/win32-msvc2010'
33 endif 33 endif
34 endif 34 endif
35 35
36 define $(PKG)_BUILD 36 define $(PKG)_BUILD
37 cd '$(1)/Qt4Qt5' && '$(HOST_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION) 37 cd '$(1)/Qt4Qt5' && '$(MXE_QMAKE)' -makefile $($(PKG)_QMAKE_SPEC_OPTION) QMAKE_UIC=$(MXE_UIC) QMAKE_MOC=$(MXE_MOC)
38 38
39 if [ $(MXE_SYSTEM) = msvc ]; then \ 39 if [ $(MXE_SYSTEM) = msvc ]; then \
40 mkdir -p '$(3)' && \ 40 mkdir -p '$(3)' && \
41 cd '$(1)/Qt4Qt5' && \ 41 cd '$(1)/Qt4Qt5' && \
42 env -u MAKE -u MAKEFLAGS nmake && \ 42 env -u MAKE -u MAKEFLAGS nmake && \