Mercurial > mxe-octave
diff src/qscintilla.mk @ 4503:bb63484e88ae
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 |
line wrap: on
line diff
--- a/src/qscintilla.mk Tue Oct 10 15:03:01 2017 -0400 +++ b/src/qscintilla.mk Wed Oct 11 12:39:28 2017 -0400 @@ -44,8 +44,13 @@ endif define $(PKG)_BUILD - cd '$(1)/Qt4Qt5' && '$(MXE_QMAKE)' -makefile $($(PKG)_QMAKE_SPEC_OPTION) QMAKE_UIC=$(MXE_UIC) \ - QMAKE_MOC=$(MXE_MOC) QMAKE_CXXFLAGS='-std=c++11' + cd '$(1)/Qt4Qt5' && \ + '$(MXE_QMAKE)' -makefile \ + $($(PKG)_QMAKE_SPEC_OPTION) \ + QMAKE_UIC='$(MXE_UIC)' \ + QMAKE_MOC='$(MXE_MOC)' \ + QMAKE_LFLAGS=$(MXE_LDFLAGS) \ + QMAKE_CXXFLAGS='-std=c++11' if [ $(MXE_SYSTEM) = msvc ]; then \ mkdir -p '$(3)' && \