From cc95e1b77c4d0d28668811a9e0264d3aba94588d Mon Sep 17 00:00:00 2001 From: APTX Date: Sun, 26 Feb 2017 14:47:52 +0100 Subject: [PATCH] Add all the required unix install commands/paths --- backendplugins/backend_mpv/backend_mpv.pro | 3 ++- backendplugins/backend_null/backend_null.pro | 4 +++- buildconfig.pri | 1 + core/core.pro | 10 +++++++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/backendplugins/backend_mpv/backend_mpv.pro b/backendplugins/backend_mpv/backend_mpv.pro index 4cb0b3b..75ffa62 100644 --- a/backendplugins/backend_mpv/backend_mpv.pro +++ b/backendplugins/backend_mpv/backend_mpv.pro @@ -1,5 +1,6 @@ TARGET = backend_mpv TEMPLATE = lib + include(../../core/core.pri) include(../backendbuildconfig.pri) @@ -20,7 +21,7 @@ unix { } unix { - target.path = /usr/lib/aniplayer/backendplugins + target.path = $${PREFIX}/lib/aniplayer/backendplugins INSTALLS += target } diff --git a/backendplugins/backend_null/backend_null.pro b/backendplugins/backend_null/backend_null.pro index 42eae60..1443ae9 100644 --- a/backendplugins/backend_null/backend_null.pro +++ b/backendplugins/backend_null/backend_null.pro @@ -1,7 +1,9 @@ TARGET = backend_null QT -= gui TEMPLATE = lib + include(../../core/core.pri) +include(../backendbuildconfig.pri) DEFINES += BACKEND_NULL_LIBRARY QT_DEPRECATED_WARNINGS @@ -11,6 +13,6 @@ HEADERS += backendnull.h\ backend_null_global.h unix { - target.path = /usr/lib + target.path = $${PREFIX}/lib/aniplayer/backendplugins INSTALLS += target } diff --git a/buildconfig.pri b/buildconfig.pri index 7972793..72bc845 100644 --- a/buildconfig.pri +++ b/buildconfig.pri @@ -4,3 +4,4 @@ CONFIG += c++14 OBJECTS_DIR = workfiles/obj MOC_DIR = workfiles/moc RCC_DIR = workfiles/rcc +include(config.pri) diff --git a/core/core.pro b/core/core.pro index 5e7a100..bc605b5 100644 --- a/core/core.pro +++ b/core/core.pro @@ -1,9 +1,8 @@ +TARGET = aniplayer TEMPLATE = app - QT += widgets qml quick -CONFIG += c++11 -TARGET = aniplayer +DEFINES += BACKEND_MPV_LIBRARY QT_DEPRECATED_WARNINGS include(core.pri) @@ -34,3 +33,8 @@ win32 { CONFIG -= embed_manifest_exe RC_FILE += aniplayer.rc } + +unix { + target.path = $${PREFIX}/bin + INSTALLS += target +} -- 2.52.0