Mercurial > mxe-octave

comparison src/gnuplot.mk @ 4297:8f864b4ea93b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot: enable wx terminal type * src/gnuplot-1-fixes.patch: patch updated * src/gnuplot.mk: update extra flags for wxwidgets
author John D
date Wed, 28 Dec 2016 14:49:14 -0500
parents 16b2ee1a1b5d
children cdb9bdcce9f5
comparison
equal deleted inserted replaced
4296:68c7e187e20d 4297:8f864b4ea93b
8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) 8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
9 $(PKG)_FILE := gnuplot-$($(PKG)_VERSION).tar.gz 9 $(PKG)_FILE := gnuplot-$($(PKG)_VERSION).tar.gz
10 $(PKG)_URL := http://sourceforge.net/projects/gnuplot/files/gnuplot/$($(PKG)_VERSION)/$($(PKG)_FILE) 10 $(PKG)_URL := http://sourceforge.net/projects/gnuplot/files/gnuplot/$($(PKG)_VERSION)/$($(PKG)_FILE)
11 $(PKG)_DEPS := 11 $(PKG)_DEPS :=
12 12
13 $(PKG)_EXTRAFLAGS :=
14
15
16 $(PKG)_DEPS += wxwidgets cairo pango
17 $(PKG)_EXTRAFLAGS += CAIRTERMS=1 CAIROLIBS=1
18 $(PKG)_EXTRAFLAGS += WXT=1 WX_CONFIG=$(MXE_TOOL_PREFIX)wx-config
19
20 #ifeq ($(ENABLE_QT5),yes)
21 # $(PKG)_DEPS += qt5
22 # $(PKG)_EXTRAFLAGS += QT=1 QT_DIR=$(HOST_PREFIX)/qt5
23 #endif
24
13 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 25 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
14 $(PKG)_EXTRAFLAGS := ICONV_CFLAGS='-I$(HOST_INCDIR)' ICONV_LDFLAGS='-L$(HOST_LIBDIR)' 26 $(PKG)_EXTRAFLAGS += ICONV_CFLAGS='-I$(HOST_INCDIR)' ICONV_LDFLAGS='-L$(HOST_LIBDIR)'
15 endif 27 endif
16 28
17 define $(PKG)_UPDATE 29 define $(PKG)_UPDATE
18 echo 'Warning: Updates are temporarily disabled for package gnuplot.' >&2; 30 echo 'Warning: Updates are temporarily disabled for package gnuplot.' >&2;
19 echo $(gnuplot_VERSION) 31 echo $(gnuplot_VERSION)
49 ## MG: not sure what to do with these and how to integrate with DESTDIR 61 ## MG: not sure what to do with these and how to integrate with DESTDIR
50 $(INSTALL) -d '$(TOP_DIR)/gnuplot/bin' 62 $(INSTALL) -d '$(TOP_DIR)/gnuplot/bin'
51 $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(TOP_DIR)/gnuplot/bin/' 63 $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(TOP_DIR)/gnuplot/bin/'
52 $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(TOP_DIR)/gnuplot/bin/' 64 $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(TOP_DIR)/gnuplot/bin/'
53 $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(TOP_DIR)/gnuplot/bin/' 65 $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(TOP_DIR)/gnuplot/bin/'
54
55 endef 66 endef
56 else 67 else
57 ifeq ($(MXE_SYSTEM),msvc) 68 ifeq ($(MXE_SYSTEM),msvc)
58 define $(PKG)_BUILD 69 define $(PKG)_BUILD
59 $(INSTALL) -d '$(3)$(HOST_PREFIX)' 70 $(INSTALL) -d '$(3)$(HOST_PREFIX)'