Mercurial > mxe-octave

comparison src/qscintilla.mk @ 4410:9b1f851080b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscitilla: update to 2.10.1 * src/qscintilla.mk: update version, checksum, use -std=c++11, use _qtX notation of lib names * src/qscintilla-1-fixes.patch: update patch * src/qscintilla-2-matlab-fold.patch: removed patch * src/qscintilla-3-matlab-block-comment.patch: update patch, rename => qscintilla-2-matlab-block-comment.patch * src/qscintilla-4-matlab-end-op.patch: update patch, rename => qscintilla-3-matlab-end-op.patch * dist-files.mk: add qscintilla-2-matlab-block-comment.patch, scintilla-3-matlab-end-op.patch, remove qscintilla-2-matlab-fold.patch qscintilla-4-matlab-end-op.patch qscintilla-3-matlab-block-comment.patch
author John D
date Mon, 10 Jul 2017 17:00:55 -0400
parents 44b1a9b2193e
children bb63484e88ae
comparison
equal deleted inserted replaced
4409:60b45297db4a 4410:9b1f851080b6
1 # This file is part of MXE. 1 # This file is part of MXE.
2 # See index.html for further information. 2 # See index.html for further information.
3 3
4 PKG := qscintilla 4 PKG := qscintilla
5 $(PKG)_IGNORE := 5 $(PKG)_IGNORE :=
6 $(PKG)_VERSION := 2.9.3 6 $(PKG)_VERSION := 2.10.1
7 $(PKG)_CHECKSUM := d62c36272f47a176177613dd8260961d50d0ed64 7 $(PKG)_CHECKSUM := f12499c18d80cb59fa46df3ee76ad2c66692e818
8 $(PKG)_SUBDIR := QScintilla_gpl-$($(PKG)_VERSION) 8 $(PKG)_SUBDIR := QScintilla_gpl-$($(PKG)_VERSION)
9 $(PKG)_FILE := QScintilla_gpl-$($(PKG)_VERSION).tar.gz 9 $(PKG)_FILE := QScintilla_gpl-$($(PKG)_VERSION).tar.gz
10 $(PKG)_URL := http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-$($(PKG)_VERSION)/$($(PKG)_FILE) 10 $(PKG)_URL := http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-$($(PKG)_VERSION)/$($(PKG)_FILE)
11 11
12 12
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) QMAKE_MOC=$(MXE_MOC) 47 cd '$(1)/Qt4Qt5' && '$(MXE_QMAKE)' -makefile $($(PKG)_QMAKE_SPEC_OPTION) QMAKE_UIC=$(MXE_UIC) \
48 QMAKE_MOC=$(MXE_MOC) QMAKE_CXXFLAGS='-std=c++11'
48 49
49 if [ $(MXE_SYSTEM) = msvc ]; then \ 50 if [ $(MXE_SYSTEM) = msvc ]; then \
50 mkdir -p '$(3)' && \ 51 mkdir -p '$(3)' && \
51 cd '$(1)/Qt4Qt5' && \ 52 cd '$(1)/Qt4Qt5' && \
52 env -u MAKE -u MAKEFLAGS nmake && \ 53 env -u MAKE -u MAKEFLAGS nmake && \
57 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \ 58 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \
58 fi 59 fi
59 60
60 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwyes ]; then \ 61 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwyes ]; then \
61 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib'; \ 62 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib'; \
62 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/bin/'; \ 63 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2_qt5$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/bin/'; \
63 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ 64 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2_qt5$(LIBRARY_SUFFIX).dll'; \
64 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/libqscintilla2.a' '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/libqscintilla2-qt5.a'; \
65 fi 65 fi
66 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwno ]; then \ 66 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwno ]; then \
67 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \ 67 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
68 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \ 68 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2_qt4$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \
69 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ 69 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2_qt4$(LIBRARY_SUFFIX).dll'; \
70 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/libqscintilla2_qt4.a' '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/libqscintilla2.a'; \
70 fi 71 fi
71 72
72 73
73 # Qmake under MSVC uses Win32 paths. When combining this with 74 # Qmake under MSVC uses Win32 paths. When combining this with
74 # DESTDIR usage (or equivalent), the real Win32 directory hierarchy 75 # DESTDIR usage (or equivalent), the real Win32 directory hierarchy