Merge pull request #351 from in1tiate/in1tiate/sane-libs

Search for libraries inside a dedicated "lib" folder (and notes on distributing future releases)
This commit is contained in:
oldmud0 2020-12-28 12:28:10 -06:00 committed by GitHub
commit 9cd533cf40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions

View File

@ -14,6 +14,7 @@ SOURCES += $$files($$PWD/src/*.cpp)
HEADERS += $$files($$PWD/include/*.h) HEADERS += $$files($$PWD/include/*.h)
LIBS += -L$$PWD/lib LIBS += -L$$PWD/lib
QMAKE_LFLAGS += -Wl,-rpath,"'\$$ORIGIN/lib'"
# Uncomment for verbose network logging # Uncomment for verbose network logging
# DEFINES += DEBUG_NETWORK # DEFINES += DEBUG_NETWORK

View File

@ -21,6 +21,8 @@ int main(int argc, char *argv[])
AOApplication main_app(argc, argv); AOApplication main_app(argc, argv);
AOApplication::addLibraryPath(AOApplication::applicationDirPath() + "/lib");
QSettings *configini = main_app.configini; QSettings *configini = main_app.configini;
QPluginLoader apngPlugin("qapng"); QPluginLoader apngPlugin("qapng");