From f451beef0de619646078cb9d55f508032dce61cd Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Sun, 20 Apr 2014 12:36:21 +0200 Subject: [PATCH] Update qmake files As promised, here is me updating the qmake project files in order to allow building the new version with qmake instead of cmake. --- libs/qcustomplot-source/qcustomplot.pro | 10 ++++++++++ sqlitebrowser.pro | 1 + src/src.pro | 13 ++++++++----- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 libs/qcustomplot-source/qcustomplot.pro diff --git a/libs/qcustomplot-source/qcustomplot.pro b/libs/qcustomplot-source/qcustomplot.pro new file mode 100644 index 00000000..6a7b2ee2 --- /dev/null +++ b/libs/qcustomplot-source/qcustomplot.pro @@ -0,0 +1,10 @@ +TEMPLATE = lib + +CONFIG += staticlib +CONFIG += debug_and_release + +HEADERS += \ + qcustomplot.h + +SOURCES += \ + qcustomplot.cpp diff --git a/sqlitebrowser.pro b/sqlitebrowser.pro index c0bd1498..b55f2232 100644 --- a/sqlitebrowser.pro +++ b/sqlitebrowser.pro @@ -4,4 +4,5 @@ CONFIG += debug_and_release SUBDIRS = libs/antlr-2.7.7/antlr.pro \ libs/qhexedit/qhexedit.pro \ + libs/qcustomplot-source/qcustomplot.pro \ src diff --git a/src/src.pro b/src/src.pro index d98c3fad..0ac9b80f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -41,7 +41,7 @@ HEADERS += \ SqlExecutionArea.h \ VacuumDialog.h \ DbStructureModel.h \ - ../../libs/qcustomplot-source/qcustomplot.h + ../../libs/qcustomplot-source/qcustomplot.h SOURCES += \ sqlitedb.cpp \ @@ -64,7 +64,7 @@ SOURCES += \ SqlExecutionArea.cpp \ VacuumDialog.cpp \ DbStructureModel.cpp \ - ../../libs/qcustomplot-source/qcustomplot.cpp + ../../libs/qcustomplot-source/qcustomplot.cpp RESOURCES += icons/icons.qrc @@ -82,6 +82,7 @@ FORMS += \ LIBPATH_QHEXEDIT=$$PWD/../libs/qhexedit LIBPATH_ANTLR=$$PWD/../libs/antlr-2.7.7 +LIBPATH_QCUSTOMPLOT=$$PWD/../libs/qcustomplot-source unix { LIBS += -ldl } @@ -91,10 +92,12 @@ win32 { CONFIG(debug,debug|release) { LIBPATH_QHEXEDIT = $$LIBPATH_QHEXEDIT/debug LIBPATH_ANTLR = $$LIBPATH_ANTLR/debug + LIBPATH_QCUSTOMPLOT = $$LIBPATH_QCUSTOMPLOT/debug } CONFIG(release,debug|release) { LIBPATH_QHEXEDIT = $$LIBPATH_QHEXEDIT/release LIBPATH_ANTLR = $$LIBPATH_ANTLR/release + LIBPATH_QCUSTOMPLOT = $$LIBPATH_QCUSTOMPLOT/release } } mac { @@ -108,6 +111,6 @@ mac { } UI_DIR = .ui -INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit -LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -lantlr -lqhexedit -lsqlite3 -DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit +INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/.. +LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -lantlr -lqhexedit -lqcustomplot -lsqlite3 +DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source