Mercurial > mxe-octave

comparison src/qscintilla.mk @ 4503:bb63484e88ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscintilla: Pass MXE_LDFLAGS to qmake.
author John W. Eaton <jwe@octave.org>
date Wed, 11 Oct 2017 12:39:28 -0400
parents 9b1f851080b6
children 8e522798c9a7
comparison
equal deleted inserted replaced
4502:ea11b18f72ae 4503:bb63484e88ae
42 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_LIBDIR)/qt4/mkspecs/win32-msvc2010' 42 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_LIBDIR)/qt4/mkspecs/win32-msvc2010'
43 endif 43 endif
44 endif 44 endif
45 45
46 define $(PKG)_BUILD 46 define $(PKG)_BUILD
47 cd '$(1)/Qt4Qt5' && '$(MXE_QMAKE)' -makefile $($(PKG)_QMAKE_SPEC_OPTION) QMAKE_UIC=$(MXE_UIC) \ 47 cd '$(1)/Qt4Qt5' && \
48 QMAKE_MOC=$(MXE_MOC) QMAKE_CXXFLAGS='-std=c++11' 48 '$(MXE_QMAKE)' -makefile \
49 $($(PKG)_QMAKE_SPEC_OPTION) \
50 QMAKE_UIC='$(MXE_UIC)' \
51 QMAKE_MOC='$(MXE_MOC)' \
52 QMAKE_LFLAGS=$(MXE_LDFLAGS) \
53 QMAKE_CXXFLAGS='-std=c++11'
49 54
50 if [ $(MXE_SYSTEM) = msvc ]; then \ 55 if [ $(MXE_SYSTEM) = msvc ]; then \
51 mkdir -p '$(3)' && \ 56 mkdir -p '$(3)' && \
52 cd '$(1)/Qt4Qt5' && \ 57 cd '$(1)/Qt4Qt5' && \
53 env -u MAKE -u MAKEFLAGS nmake && \ 58 env -u MAKE -u MAKEFLAGS nmake && \