diff --git a/Plotline.pro b/Plotline.pro
index 9c1a3c4..728d35d 100644
--- a/Plotline.pro
+++ b/Plotline.pro
@@ -7,9 +7,10 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = src \
- test \
doc
+CONFIG(debug, debug|release): SUBDIRS += test
+
OTHER_FILES = \
README.markdown
diff --git a/packages/me.rngr.plotline/meta/package.xml b/packages/me.rngr.plotline/meta/package.xml
index 283c6ae..2b0c4bb 100644
--- a/packages/me.rngr.plotline/meta/package.xml
+++ b/packages/me.rngr.plotline/meta/package.xml
@@ -4,8 +4,8 @@
Application to create, manage, and publish a novel.
- 0.0.1
- 2016-02-23
+ 1.0
+ 2016-03-04
me.rngr.plotline
diff --git a/plotline.sh b/plotline.sh
index 75a2a46..48f44ca 100755
--- a/plotline.sh
+++ b/plotline.sh
@@ -1,3 +1,6 @@
#!/bin/bash
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:src/lib ./src/app/plotline
+# Thanks to https://stackoverflow.com/a/246128
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:src/lib $DIR/src/app/plotline
diff --git a/test/test.pro b/test/test.pro
index 87688ba..21a6692 100644
--- a/test/test.pro
+++ b/test/test.pro
@@ -5,4 +5,11 @@
TEMPLATE = subdirs
SUBDIRS += \
- unit
+ ./unit
+
+LIBS += -L$$OUT_PWD../../src/lib/libplotline.a
+
+INCLUDEPATH += \
+ $$PWD/../../src/lib
+
+CONFIG += c++11
diff --git a/test/unit/unit.pro b/test/unit/unit.pro
index 411d0fe..d7c2cfc 100644
--- a/test/unit/unit.pro
+++ b/test/unit/unit.pro
@@ -31,26 +31,17 @@ DISTFILES += \
fixtures/revision-deserialize.json \
fixtures/revision-bug-test.json
-REQUIRES += \
- $$PWD/../../src/lib \
- $$PWD/../../src/app
-
-INCLUDEPATH += \
- $$OUT_PWD/../../src/lib \
- $$OUT_PWD/../../src/app
-
##
# Depending on whether we're building the libraries statically or dynamically,
# Either the .so will be found or the .a will be found.
# There is probably a more elegant solution.
##
-exists($$OUT_PWD/../../src/lib/libplotline.a){
- LIBS += $$OUT_PWD/../../src/lib/libplotline.a
-}
+CONFIG += console testcase c++11
-exists($$OUT_PWD/../../src/lib/libplotline.so){
- LIBS += $$OUT_PWD/../../src/lib/libplotline.so
-}
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../src/lib/release/ -lplotline
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../src/lib/debug/ -lplotline
+else:unix: LIBS += -L$$OUT_PWD/../../src/lib/ -lplotline
-CONFIG += console testcase c++11
+INCLUDEPATH += $$PWD/../../src/lib
+DEPENDPATH += $$PWD/../../src/lib