flipperdevices
/
qFlipper
mirror of https://github.com/flipperdevices/qFlipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix linkage agains static Qt6 on linux (#167)

This commit is contained in:
Georgii Surkov 2023-03-13 17:32:23 +03:00 committed by GitHub
parent 4096657c86
commit 9dfb53c136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/application.pro
View File

@ -40,6 +40,10 @@ win32:!win32-g++ {
PRE_TARGETDEPS += \
$$OUT_PWD/../backend/libbackend.a \
$$OUT_PWD/../dfu/libdfu.a
contains(CONFIG, static): PRE_TARGETDEPS += \
$$OUT_PWD/../plugins/libflipperproto0.a \
$$OUT_PWD/../3rdparty/lib3rdparty.a
}
unix|win32 {
@ -48,8 +52,8 @@ unix|win32 {
-L$$OUT_PWD/../dfu/ -ldfu
contains(CONFIG, static): LIBS += \
-L$$OUT_PWD/../3rdparty/ -l3rdparty \
-L$$OUT_PWD/../plugins/ -lflipperproto0
-L$$OUT_PWD/../plugins/ -lflipperproto0 \
-L$$OUT_PWD/../3rdparty/ -l3rdparty
}
win32 {

21
cli/cli.pro
View File

@ -9,16 +9,29 @@ DESTDIR = $$OUT_PWD/..
CONFIG += c++11 console
CONFIG -= app_bundle
win32:!win32-g++ {
PRE_TARGETDEPS += \
$$OUT_PWD/../backend/backend.lib \
$$OUT_PWD/../dfu/dfu.lib
} else:unix|win32-g++ {
PRE_TARGETDEPS += \
$$OUT_PWD/../backend/libbackend.a \
$$OUT_PWD/../dfu/libdfu.a
contains(CONFIG, static): PRE_TARGETDEPS += \
$$OUT_PWD/../plugins/libflipperproto0.a \
$$OUT_PWD/../3rdparty/lib3rdparty.a
}
unix|win32 {
LIBS += \
-L$$OUT_PWD/../3rdparty/ -l3rdparty \
-L$$OUT_PWD/../plugins/ -lflipperproto0 \
-L$$OUT_PWD/../backend/ -lbackend \
-L$$OUT_PWD/../dfu/ -ldfu
contains(CONFIG, static): LIBS += \
-L$$OUT_PWD/../3rdparty/ -l3rdparty \
-L$$OUT_PWD/../plugins/ -lflipperproto0
-L$$OUT_PWD/../plugins/ -lflipperproto0 \
-L$$OUT_PWD/../3rdparty/ -l3rdparty
}
win32 {