Mercurial > mxe-octave

comparison src/gnuplot.mk @ 4472:0fdeee4cfe11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot: enable Qt terminal and set default to wxt * src/gnuplot.mk: Depend on qt5 and build with QT=1 QT_DIR=$(HOST_PREFIX)/qt QT_BIN_DIR=(BUILD_TOOLS_PREFIX)/bin, install gnuplot_qt.exe * src/gnuplot-1-fixes.patch: add to patchto allow override of QT tools and paths * installer-files/octave-firsttime.vbs: set GNUTERM=wxt * installer-files/octave.vbs: set GNUTERM=wxt * installer-files/octave.bat: set GNUTERM=wxt * installer-files/cmdshell.bat: set GNUTERM=wxt
author Mike Miller <mtmiller@octave.org>
date Wed, 06 Sep 2017 16:19:37 -0700
parents c615db675618
children 5875a3c3404c
comparison
equal deleted inserted replaced
4471:1a3deda73484 4472:0fdeee4cfe11
16 $(PKG)_DEPS += wxwidgets cairo pango 16 $(PKG)_DEPS += wxwidgets cairo pango
17 $(PKG)_EXTRAFLAGS += CAIROTERMS=1 CAIROLIBS=1 17 $(PKG)_EXTRAFLAGS += CAIROTERMS=1 CAIROLIBS=1
18 $(PKG)_EXTRAFLAGS += WXT=1 WX_CONFIG=$(MXE_TOOL_PREFIX)wx-config 18 $(PKG)_EXTRAFLAGS += WXT=1 WX_CONFIG=$(MXE_TOOL_PREFIX)wx-config
19 endif 19 endif
20 20
21 #ifeq ($(ENABLE_QT5),yes) 21 ifeq ($(ENABLE_QT5),yes)
22 # $(PKG)_DEPS += qt5 22 $(PKG)_DEPS += qt5
23 # $(PKG)_EXTRAFLAGS += QT=1 QT_DIR=$(HOST_PREFIX)/qt5 23 $(PKG)_EXTRAFLAGS += QT=1 QT_DIR="$(HOST_PREFIX)/qt5" QT_BIN_DIR="$(BUILD_TOOLS_PREFIX)/bin"
24 #endif 24 endif
25 25
26 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 26 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
27 $(PKG)_EXTRAFLAGS += ICONV_CFLAGS='-I$(HOST_INCDIR)' ICONV_LDFLAGS='-L$(HOST_LIBDIR)' 27 $(PKG)_EXTRAFLAGS += ICONV_CFLAGS='-I$(HOST_INCDIR)' ICONV_LDFLAGS='-L$(HOST_LIBDIR)'
28 endif 28 endif
29 29
39 39
40 $(INSTALL) -d '$(3)$(HOST_BINDIR)' 40 $(INSTALL) -d '$(3)$(HOST_BINDIR)'
41 $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(3)$(HOST_BINDIR)' 41 $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(3)$(HOST_BINDIR)'
42 $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(3)$(HOST_BINDIR)' 42 $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(3)$(HOST_BINDIR)'
43 $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(3)$(HOST_BINDIR)' 43 $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(3)$(HOST_BINDIR)'
44
45 if [ "$(ENABLE_QT5)" == "yes" ]; then \
46 make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) -std=gnu++11' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot_qt.exe gnuplot_qt.exe; \
47 $(INSTALL) -m755 '$(1)/config/mingw/gnuplot_qt.exe' '$(3)$(HOST_BINDIR)'; \
48 fi
44 49
45 # config files 50 # config files
46 $(INSTALL) -d '$(3)$(HOST_PREFIX)/share' 51 $(INSTALL) -d '$(3)$(HOST_PREFIX)/share'
47 $(INSTALL) -m644 '$(1)/share/gnuplotrc' '$(3)$(HOST_PREFIX)/share/' 52 $(INSTALL) -m644 '$(1)/share/gnuplotrc' '$(3)$(HOST_PREFIX)/share/'
48 53