diff --git a/.qmake.conf b/.qmake.conf index c5384d3..d96a3bf 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1 +1,2 @@ -top_srcdir=$$PWD/bin \ No newline at end of file +bin_dir=$$PWD/bin +lib_dir=$$PWD/lib \ No newline at end of file diff --git a/SparrowBot.pro b/SparrowBot.pro index a8d5245..fe921d4 100644 --- a/SparrowBot.pro +++ b/SparrowBot.pro @@ -1,7 +1,5 @@ QT += core gui network widgets -BIN = bin - TEMPLATE = subdirs CONFIG += ordered c++11 SUBDIRS = ircbot \ diff --git a/app/app.pro b/app/app.pro index de63268..0f6a704 100644 --- a/app/app.pro +++ b/app/app.pro @@ -1,12 +1,12 @@ QT += core gui network widgets -DESTDIR = $$top_srcdir +DESTDIR = $$bin_dir TARGET = SparrowBot TEMPLATE = app CONFIG += c++11 -LIBS += $$top_srcdir/libircbot.a +LIBS += $$lib_dir/libircbot.a INCLUDEPATH += ../ircbot SOURCES = main.cpp \ diff --git a/ircbot/ircbot.pro b/ircbot/ircbot.pro index 60e7be0..5d94d22 100644 --- a/ircbot/ircbot.pro +++ b/ircbot/ircbot.pro @@ -1,6 +1,6 @@ QT += core gui network widgets -DESTDIR = $$top_srcdir +DESTDIR = $$lib_dir TARGET = ircbot diff --git a/lib/libircbot.a b/lib/libircbot.a new file mode 100644 index 0000000..22b8e63 Binary files /dev/null and b/lib/libircbot.a differ