From 3927247f544b991bb29812d457ddf37f88a744ea Mon Sep 17 00:00:00 2001 From: Adrian Musceac Date: Mon, 23 Feb 2015 22:18:57 +0000 Subject: [PATCH] Link MapGraphics statically --- MapGraphics/MapGraphics.pro | 1 + QRadioPredict/QRadioPredict.pro | 5 ++--- QRadioPredict/settingsdialog.ui | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MapGraphics/MapGraphics.pro b/MapGraphics/MapGraphics.pro index 90162ec..4b09485 100644 --- a/MapGraphics/MapGraphics.pro +++ b/MapGraphics/MapGraphics.pro @@ -9,6 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = MapGraphics TEMPLATE = lib +CONFIG += staticlib DEFINES += MAPGRAPHICS_LIBRARY diff --git a/QRadioPredict/QRadioPredict.pro b/QRadioPredict/QRadioPredict.pro index bd20bcf..17c6943 100644 --- a/QRadioPredict/QRadioPredict.pro +++ b/QRadioPredict/QRadioPredict.pro @@ -121,10 +121,9 @@ FORMS += MainWindow.ui \ #Linkage for MapGraphics shared library win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../MapGraphics/release/ -lMapGraphics else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../MapGraphics/debug/ -lMapGraphics -else:unix:!symbian: LIBS += -L$$OUT_PWD/../MapGraphics/ -lMapGraphics +else:unix:!symbian: LIBS += $$OUT_PWD/../MapGraphics/libMapGraphics.a INCLUDEPATH += $$PWD/../MapGraphics -INCLUDEPATH += /home/adrian/c++/gdal/include/ -DEPENDPATH += $$PWD/../MapGraphics +#DEPENDPATH += $$PWD/../MapGraphics unix:!symbian: LIBS += -lgdal RESOURCES += \ diff --git a/QRadioPredict/settingsdialog.ui b/QRadioPredict/settingsdialog.ui index f2f6b73..9b46475 100644 --- a/QRadioPredict/settingsdialog.ui +++ b/QRadioPredict/settingsdialog.ui @@ -353,7 +353,7 @@ - Not suitable for plot mode +