Mercurial > mxe-octave

comparison src/default-octave.mk @ 4502:ea11b18f72ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
default-octave: Set Qscintilla library name for configure.
author John W. Eaton <jwe@octave.org>
date Tue, 10 Oct 2017 15:03:01 -0400
parents 8f9bee27223f
children dd217cbcc0a2
comparison
equal deleted inserted replaced
4501:b74853c2afa1 4502:ea11b18f72ae
62 62
63 ifeq ($(ENABLE_QT5),yes) 63 ifeq ($(ENABLE_QT5),yes)
64 #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" 64 #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
65 $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" 65 $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
66 $(PKG)_QTDIR := $(HOST_PREFIX)/qt5 66 $(PKG)_QTDIR := $(HOST_PREFIX)/qt5
67 $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt5"
67 else 68 else
68 $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" 69 $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
69 $(PKG)_QTDIR := $(HOST_PREFIX) 70 $(PKG)_QTDIR := $(HOST_PREFIX)
71 $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt4"
70 endif 72 endif
71 73
72 74
73 ifneq ($(ENABLE_DOCS),yes) 75 ifneq ($(ENABLE_DOCS),yes)
74 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs 76 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs