--- application/application.pro | 5 ++--- cli/cli.pro | 5 ++--- plugins/flipperproto0/flipperproto0.pro | 5 ++--- qFlipper.pro | 2 -- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/application/application.pro b/application/application.pro index c8b24333..28683b70 100644 --- a/application/application.pro +++ b/application/application.pro @@ -47,8 +47,7 @@ win32:!win32-g++ { $$OUT_PWD/../dfu/libdfu.a contains(CONFIG, static): PRE_TARGETDEPS += \ - $$OUT_PWD/../plugins/libflipperproto0.a \ - $$OUT_PWD/../3rdparty/lib3rdparty.a + $$OUT_PWD/../plugins/libflipperproto0.a } unix|win32 { @@ -58,7 +57,7 @@ unix|win32 { contains(CONFIG, static): LIBS += \ -L$$OUT_PWD/../plugins/ -lflipperproto0 \ - -L$$OUT_PWD/../3rdparty/ -l3rdparty + -lprotobuf-nanopb } win32 { diff --git a/cli/cli.pro b/cli/cli.pro index 5c007e7d..fe0106ee 100644 --- a/cli/cli.pro +++ b/cli/cli.pro @@ -20,8 +20,7 @@ win32:!win32-g++ { $$OUT_PWD/../dfu/libdfu.a contains(CONFIG, static): PRE_TARGETDEPS += \ - $$OUT_PWD/../plugins/libflipperproto0.a \ - $$OUT_PWD/../3rdparty/lib3rdparty.a + $$OUT_PWD/../plugins/libflipperproto0.a } unix|win32 { @@ -31,7 +30,7 @@ unix|win32 { contains(CONFIG, static): LIBS += \ -L$$OUT_PWD/../plugins/ -lflipperproto0 \ - -L$$OUT_PWD/../3rdparty/ -l3rdparty + -lprotobuf-nanopb } win32 { diff --git a/plugins/flipperproto0/flipperproto0.pro b/plugins/flipperproto0/flipperproto0.pro index 64848402..c6b9fee7 100644 --- a/plugins/flipperproto0/flipperproto0.pro +++ b/plugins/flipperproto0/flipperproto0.pro @@ -12,8 +12,7 @@ CONFIG += plugin c++11 VERSION = 0.0.0 -INCLUDEPATH += $$PWD/../protobufinterface \ - $$PWD/../../3rdparty/nanopb +INCLUDEPATH += $$PWD/../protobufinterface HEADERS += \ guirequest.h \ @@ -65,7 +64,7 @@ SOURCES += \ systemresponse.cpp unix|win32 { - LIBS += -L$$OUT_PWD/../../3rdparty/ -l3rdparty + LIBS += -lprotobuf-nanopb } DEFINES += PB_ENABLE_MALLOC diff --git a/qFlipper.pro b/qFlipper.pro index 1bb97627..8b2a6c44 100644 --- a/qFlipper.pro +++ b/qFlipper.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ - 3rdparty \ application \ backend \ dfu \ @@ -11,4 +10,3 @@ SUBDIRS += \ backend.depends = dfu plugins application.depends = backend cli.depends = backend -plugins.depends = 3rdparty -- 2.39.2