d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1849 from muellni/qt4overlay 

qt4 overlay plugin (for vtk and qwt)
This commit is contained in:
Tony Theodore 2017-07-25 13:27:40 +10:00 committed by GitHub
parent 5c8da15da1 5a0af1b21c
commit d67a6ed5dd
4 changed files with 14 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/qt4/qt4-overlay.mk Normal file
View File

@ -0,0 +1,11 @@
# This file is part of MXE. See LICENSE.md for licensing information.
# override relevant vtk and qwt variables to build against Qt 4 instead of 5
PKG := vtk
$(PKG)_DEPS := gcc hdf5 qt libpng expat libxml2 jsoncpp tiff freetype lz4 hdf5 libharu glew
$(PKG)_QT_VERSION := 4
PKG := qwt
$(PKG)_DEPS := gcc qt
$(PKG)_QT_DIR := qt

5
src/qwt.mk
View File

@ -8,6 +8,7 @@ $(PKG)_CHECKSUM := 027c32c0473a682c1db5b9cb02ebed5e39a4fbb0afd2306e23b1113c30006
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $($(PKG)_SUBDIR).zip
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_QT_DIR := qt5
$(PKG)_DEPS := gcc qtbase qtsvg
define $(PKG)_UPDATE
@ -21,11 +22,11 @@ define $(PKG)_BUILD
echo "QWT_CONFIG -= QwtDll" >> '$(1)/qwtconfig.pri')
# build
cd '$(1)/src' && $(PREFIX)/$(TARGET)/qt5/bin/qmake
cd '$(1)/src' && $(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/bin/qmake
$(MAKE) -C '$(1)/src' -f 'Makefile.Release' -j '$(JOBS)' install
#build sinusplot example to test linkage
cd '$(1)/examples/sinusplot' && $(PREFIX)/$(TARGET)/qt5/bin/qmake
cd '$(1)/examples/sinusplot' && $(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/bin/qmake
$(MAKE) -C '$(1)/examples/sinusplot' -f 'Makefile.Release' -j '$(JOBS)'
# install

24
src/qwt_qt4-1-fixes-crlf.patch
View File

@ -1,24 +0,0 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 888c3a631c821e3d27efbcd3da6247c3a5add135 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 9 Dec 2014 20:10:47 +1100
Subject: [PATCH] fix install prefix
diff --git a/qwtconfig.pri b/qwtconfig.pri
index 1fe6055..3a69039 100644
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
@@ -24,7 +24,7 @@ unix {
}
win32 {
- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
+ # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
}
--
2.7.4

32
src/qwt_qt4.mk
View File

@ -1,32 +0,0 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := qwt_qt4
$(PKG)_WEBSITE := https://qwt.sourceforge.io/
$(PKG)_DESCR := Qwt-qt4
$(PKG)_VERSION = $(qwt_VERSION)
$(PKG)_CHECKSUM = $(qwt_CHECKSUM)
$(PKG)_SUBDIR = $(qwt_SUBDIR)
$(PKG)_FILE = $(qwt_FILE)
$(PKG)_WEBSITE = $(qwt_WEBSITE)
$(PKG)_URL = $(qwt_URL)
$(PKG)_DEPS := gcc qt
define $(PKG)_UPDATE
echo $(qwt_VERSION)
endef
define $(PKG)_BUILD
$(if $(BUILD_STATIC),\
echo "QWT_CONFIG -= QwtDll" >> '$(1)/qwtconfig.pri')
# build
cd '$(1)/src' && $(PREFIX)/$(TARGET)/qt/bin/qmake
$(MAKE) -C '$(1)/src' -f 'Makefile.Release' -j '$(JOBS)' install
#build sinusplot example to test linkage
cd '$(1)/examples/sinusplot' && $(PREFIX)/$(TARGET)/qt/bin/qmake
$(MAKE) -C '$(1)/examples/sinusplot' -f 'Makefile.Release' -j '$(JOBS)'
# install
$(INSTALL) -m755 '$(1)/examples/bin/sinusplot.exe' '$(PREFIX)/$(TARGET)/bin/test-qwt-qt4.exe'
endef