90 lines
2.3 KiB
Diff
90 lines
2.3 KiB
Diff
https://github.com/opengribs/XyGrib/commit/a687a2b9ddbd988661ba000b9a2685e7493bc92c.patch
|
|
|
|
From a687a2b9ddbd988661ba000b9a2685e7493bc92c Mon Sep 17 00:00:00 2001
|
|
From: Menno <menno__@xs4all.nl>
|
|
Date: Sun, 10 Jun 2018 00:31:06 +0200
|
|
Subject: [PATCH] remove references to qwt from Makefiles
|
|
|
|
---
|
|
Makefile | 12 +-----------
|
|
src/xyGrib.pro | 4 ++--
|
|
2 files changed, 3 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index f7b81e1..46c1e0c 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -2,19 +2,16 @@ QMAKE=/usr/bin/qmake
|
|
|
|
INSTALLDIR=$(HOME)/XyGrib
|
|
MACQTBIN=/usr/local/Qt-5.3.2/bin/
|
|
-QWTDIR=src/qwt-6.1.3
|
|
|
|
all: XyGrib
|
|
|
|
-SRC= src/*.h src/*.cpp src/*/*.h src/*/*.cpp \
|
|
- src/qwt*/src/*.cpp src/qwt*/src/*.h
|
|
+SRC= src/*.h src/*.cpp src/*/*.h src/*/*.cpp
|
|
|
|
mac: $(SRC)
|
|
rm -f ./XyGrib
|
|
rm -fr ./XyGrib.app
|
|
rm -f src/Makefile
|
|
cd src/g2clib; make -f makefile.osx
|
|
- cd $(QWTDIR)/src; $(MACQTBIN)/qmake; make -j6
|
|
cd src; $(MACQTBIN)/qmake; make -j6
|
|
|
|
macclean:
|
|
@@ -22,8 +19,6 @@ macclean:
|
|
rm -fr XyGrib.app
|
|
rm -f src/XyGrib
|
|
rm -f src/release/XyGrib.exe
|
|
- rm -f $(QWTDIR)/lib/*
|
|
- cd $(QWTDIR)/src; $(MACQTBIN)/qmake; make clean
|
|
cd src; $(MACQTBIN)/qmake; make clean
|
|
|
|
clean:
|
|
@@ -34,15 +29,12 @@ clean:
|
|
cd src; $(QMAKE); make clean
|
|
|
|
veryclean: clean
|
|
- rm -f $(QWTDIR)/lib/*
|
|
- cd $(QWTDIR)/src; $(QMAKE); make clean
|
|
rm -f src/g2clib/libg2c.a
|
|
rm -f src/g2clib/*.o
|
|
|
|
XyGrib: $(SRC)
|
|
@ echo
|
|
rm -f ./XyGrib
|
|
- cd $(QWTDIR)/src; $(QMAKE); make -j6
|
|
cd src/g2clib; make
|
|
cd src; $(QMAKE); make -j6
|
|
@ echo "-----------------------------------"
|
|
@@ -64,5 +56,3 @@ install: XyGrib
|
|
echo 'bin/XyGrib $$*' >> ./XyGrib
|
|
chmod 755 ./XyGrib
|
|
cp -af XyGrib $(INSTALLDIR)
|
|
-
|
|
-
|
|
diff --git a/src/xyGrib.pro b/src/xyGrib.pro
|
|
index 2523af8..30879ed 100644
|
|
--- a/src/xyGrib.pro
|
|
+++ b/src/xyGrib.pro
|
|
@@ -8,7 +8,7 @@ TEMPLATE = app
|
|
TARGET = XyGrib
|
|
|
|
DEPENDPATH += . util map GUI
|
|
-INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib
|
|
+INCLUDEPATH += . util map GUI g2clib
|
|
|
|
# ----------------------------------------------------
|
|
# platform specific
|
|
@@ -36,7 +36,7 @@ else {
|
|
}
|
|
}
|
|
|
|
-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
|
|
+LIBS += -lbz2 -lz -lproj -lnova
|
|
LIBS += -Lg2clib -lg2c -lpng -ljasper # respect order!
|
|
|
|
# ----------------------------------------------------
|