From ffbaab5a2ae45291f4eb830d8d7d12275ff916cf Mon Sep 17 00:00:00 2001 From: in1tiate Date: Sat, 12 Dec 2020 06:54:31 -0600 Subject: [PATCH 1/3] Add QMake flags for "lib" directory --- Attorney_Online.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/Attorney_Online.pro b/Attorney_Online.pro index b9722b1..1a5f214 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 From 3d4d6378384fee027ccbc3706a66c2f14cc0bac0 Mon Sep 17 00:00:00 2001 From: in1tiate Date: Sat, 12 Dec 2020 06:54:45 -0600 Subject: [PATCH 2/3] Search for plugins in "lib" directory --- src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 364377b..c0a8a1d 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::setLibraryPaths({AOApplication::applicationDirPath() + "/lib"}); + QSettings *configini = main_app.configini; QPluginLoader apngPlugin("qapng"); From 38b730ce0d00576761fe125f8e97f0d9f5813978 Mon Sep 17 00:00:00 2001 From: in1tiate <32779090+in1tiate@users.noreply.github.com> Date: Mon, 28 Dec 2020 04:37:33 -0600 Subject: [PATCH 3/3] add library path instead of setting it Co-authored-by: oldmud0 --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index c0a8a1d..ce8b1dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) AOApplication main_app(argc, argv); - AOApplication::setLibraryPaths({AOApplication::applicationDirPath() + "/lib"}); + AOApplication::addLibraryPath(AOApplication::applicationDirPath() + "/lib"); QSettings *configini = main_app.configini;