aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2020-12-28 12:28:10 -0600
committerGitHub <noreply@github.com>2020-12-28 12:28:10 -0600
commit9cd533cf40eb569062a5c09f5585379ada5ae3c5 (patch)
treeee9bda7db8a7f74717f8c2a8d13c6a281f88d5ca
parent570bad6d4775df19229fb7beae7c6a011220bc1c (diff)
parent38b730ce0d00576761fe125f8e97f0d9f5813978 (diff)
Merge pull request #351 from in1tiate/in1tiate/sane-libs
Search for libraries inside a dedicated "lib" folder (and notes on distributing future releases)
-rw-r--r--Attorney_Online.pro1
-rw-r--r--src/main.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/Attorney_Online.pro b/Attorney_Online.pro
index b9722b1d..1a5f214b 100644
--- a/Attorney_Online.pro
+++ b/Attorney_Online.pro
@@ -14,6 +14,7 @@ SOURCES += $$files($$PWD/src/*.cpp)
HEADERS += $$files($$PWD/include/*.h)
LIBS += -L$$PWD/lib
+QMAKE_LFLAGS += -Wl,-rpath,"'\$$ORIGIN/lib'"
# Uncomment for verbose network logging
# DEFINES += DEBUG_NETWORK
diff --git a/src/main.cpp b/src/main.cpp
index 364377b5..ce8b1dde 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,6 +21,8 @@ int main(int argc, char *argv[])
AOApplication main_app(argc, argv);
+ AOApplication::addLibraryPath(AOApplication::applicationDirPath() + "/lib");
+
QSettings *configini = main_app.configini;
QPluginLoader apngPlugin("qapng");