Mercurial > mxe-octave

comparison src/qscintilla.mk @ 4222:44b1a9b2193e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents 7016a319a835
children 9b1f851080b6
comparison
equal deleted inserted replaced
4221:1cac12604314 4222:44b1a9b2193e
6 $(PKG)_VERSION := 2.9.3 6 $(PKG)_VERSION := 2.9.3
7 $(PKG)_CHECKSUM := d62c36272f47a176177613dd8260961d50d0ed64 7 $(PKG)_CHECKSUM := d62c36272f47a176177613dd8260961d50d0ed64
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 $(PKG)_DEPS := qt 11
12
13 ifeq ($(ENABLE_QT5),yes)
14 $(PKG)_DEPS := qt5
15 else
16 $(PKG)_DEPS := qt
17 endif
12 18
13 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 19 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
14 $(PKG)_INSTALL_ROOT := 20 $(PKG)_INSTALL_ROOT :=
15 else 21 else
16 $(PKG)_INSTALL_ROOT := $(3) 22 $(PKG)_INSTALL_ROOT := $(3)
23 $(SED) -n 's,.*QScintilla-gpl-\([0-9][^>]*\)\.zip.*,\1,p' 29 $(SED) -n 's,.*QScintilla-gpl-\([0-9][^>]*\)\.zip.*,\1,p'
24 endef 30 endef
25 31
26 ifneq ($(MXE_NATIVE_BUILD),yes) 32 ifneq ($(MXE_NATIVE_BUILD),yes)
27 ifeq ($(MXE_SYSTEM),mingw) 33 ifeq ($(MXE_SYSTEM),mingw)
28 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' 34 ifeq ($(ENABLE_QT5),yes)
35 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(BUILD_TOOLS_PREFIX)/mkspecs/win32-g++'
36 else
37 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++'
38 endif
29 endif 39 endif
30 ifeq ($(MXE_SYSTEM),msvc) 40 ifeq ($(MXE_SYSTEM),msvc)
31 # FIXME: compute "2010" suffix dynamically 41 # FIXME: compute "2010" suffix dynamically
32 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_LIBDIR)/qt4/mkspecs/win32-msvc2010' 42 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_LIBDIR)/qt4/mkspecs/win32-msvc2010'
33 endif 43 endif
45 else \ 55 else \
46 $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \ 56 $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \
47 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \ 57 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \
48 fi 58 fi
49 59
50 if [ $(MXE_SYSTEM) = mingw ]; then \ 60 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwyes ]; then \
61 $(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 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2$(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
66 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwno ]; then \
51 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \ 67 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
52 $(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$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \
53 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ 69 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
54 fi 70 fi
71
55 72
56 # Qmake under MSVC uses Win32 paths. When combining this with 73 # Qmake under MSVC uses Win32 paths. When combining this with
57 # DESTDIR usage (or equivalent), the real Win32 directory hierarchy 74 # DESTDIR usage (or equivalent), the real Win32 directory hierarchy
58 # is recreated under DESTDIR, not the MSYS hierarchy. 75 # is recreated under DESTDIR, not the MSYS hierarchy.
59 if [ $(MXE_SYSTEM) = msvc ]; then \ 76 if [ $(MXE_SYSTEM) = msvc ]; then \
60 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/bin'; \ 77 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/bin'; \
61 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/bin/'; \ 78 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/bin/'; \
62 rm -f '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ 79 rm -f '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
63 fi 80 fi
81
64 endef 82 endef