From ba8e8a32fc6e909ad0a2c152e36b6660c01fdad5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: ćšć, 21 11æ 2024 21:24:24 +0800
Subject: [PATCH] Update qmake pri
---
share/qmake/QWKCore.pri.in | 15 ++++++---------
share/qmake/QWKQuick.pri.in | 6 ++----
share/qmake/QWKWidgets.pri.in | 6 ++----
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/share/qmake/QWKCore.pri.in b/share/qmake/QWKCore.pri.in
index 42ce8d2..4ef2773 100644
--- a/share/qmake/QWKCore.pri.in
+++ b/share/qmake/QWKCore.pri.in
@@ -7,21 +7,18 @@
QMAKE_QWK_INSTALL_LIBDIR = @QMAKE_QWK_INSTALL_LIBDIR@
QMAKE_QWK_INSTALL_INCDIR = @QMAKE_QWK_INSTALL_INCDIR@
- # Shared include directory
+ # Shared link directory
+ QMAKE_QWK_LINK_PATH = "-L$$QMAKE_QWK_INSTALL_PREFIX/$$QMAKE_QWK_INSTALL_LIBDIR"
+
+ # Include directory
INCLUDEPATH += \
$$QMAKE_QWK_INSTALL_PREFIX/$$QMAKE_QWK_INSTALL_INCDIR/QWindowKit
-
- # Shared link directory
- QMAKE_QWK_LIB_PATHS += \
- "-L$$QMAKE_QWK_INSTALL_PREFIX/$$QMAKE_QWK_INSTALL_LIBDIR"
CONFIG(debug, debug|release) {
- LIBS += -l@QMAKE_QWK_CORE_NAME_DEBUG@
+ LIBS = $$QMAKE_QWK_LINK_PATH -l@QMAKE_QWK_CORE_NAME_DEBUG@ $$LIBS
} else {
- LIBS += -l@QMAKE_QWK_CORE_NAME_RELEASE@
+ LIBS = $$QMAKE_QWK_LINK_PATH -l@QMAKE_QWK_CORE_NAME_RELEASE@ $$LIBS
}
-
- LIBS = $$QMAKE_QWK_LIB_PATHS $$LIBS
@QMAKE_QWK_CORE_STATIC_MACRO@
}
\ No newline at end of file
diff --git a/share/qmake/QWKQuick.pri.in b/share/qmake/QWKQuick.pri.in
index 4ae7f67..2439999 100644
--- a/share/qmake/QWKQuick.pri.in
+++ b/share/qmake/QWKQuick.pri.in
@@ -4,12 +4,10 @@
include($$PWD/QWKCore.pri)
CONFIG(debug, debug|release) {
- LIBS = -l@QMAKE_QWK_QUICK_NAME_DEBUG@ $$LIBS
+ LIBS = $$QMAKE_QWK_LINK_PATH -l@QMAKE_QWK_QUICK_NAME_DEBUG@ $$LIBS
} else {
- LIBS = -l@QMAKE_QWK_QUICK_NAME_RELEASE@ $$LIBS
+ LIBS = $$QMAKE_QWK_LINK_PATH -l@QMAKE_QWK_QUICK_NAME_RELEASE@ $$LIBS
}
-
- LIBS = $$QMAKE_QWK_LIB_PATHS $$LIBS
@QMAKE_QWK_QUICK_STATIC_MACRO@
}
\ No newline at end of file
diff --git a/share/qmake/QWKWidgets.pri.in b/share/qmake/QWKWidgets.pri.in
index b686719..8a6fe33 100644
--- a/share/qmake/QWKWidgets.pri.in
+++ b/share/qmake/QWKWidgets.pri.in
@@ -4,12 +4,10 @@
include($$PWD/QWKCore.pri)
CONFIG(debug, debug|release) {
- LIBS = -l@QMAKE_QWK_WIDGETS_NAME_DEBUG@ $$LIBS
+ LIBS = $$QMAKE_QWK_LINK_PATH -l@QMAKE_QWK_WIDGETS_NAME_DEBUG@ $$LIBS
} else {
- LIBS = -l@QMAKE_QWK_WIDGETS_NAME_RELEASE@ $$LIBS
+ LIBS = $$QMAKE_QWK_LINK_PATH -l@QMAKE_QWK_WIDGETS_NAME_RELEASE@ $$LIBS
}
-
- LIBS = $$QMAKE_QWK_LIB_PATHS $$LIBS
@QMAKE_QWK_WIDGETS_STATIC_MACRO@
}
\ No newline at end of file
--
Gitblit v1.9.1