From 47f4ca52245b6d3b44d073820c22189103edc185 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 8 Nov 2025 15:55:41 +0100 Subject: [PATCH] Switching kj and capnp to static libs, maybe solves Windows build issues --- src/plugins/streamers/lstream/db_plugin/db_plugin.pro | 2 +- src/plugins/streamers/lstream/runtime/capnp.pro | 1 + src/plugins/streamers/lstream/runtime/capnp/capnp.pro | 1 + src/plugins/streamers/lstream/runtime/kj.pro | 1 + src/plugins/streamers/lstream/runtime/kj/kj.pro | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/streamers/lstream/db_plugin/db_plugin.pro b/src/plugins/streamers/lstream/db_plugin/db_plugin.pro index 298ea7768..796f2494b 100644 --- a/src/plugins/streamers/lstream/db_plugin/db_plugin.pro +++ b/src/plugins/streamers/lstream/db_plugin/db_plugin.pro @@ -7,7 +7,7 @@ include($$PWD/../lstream.pri) include($$PWD/capnp/capnp.pri) INCLUDEPATH += capnp $$VERSION_INC -LIBS += -L$$DESTDIR/.. -lxkj -lxcapnp +LIBS += -L$$DESTDIR/.. -lxcapnp -lxkj HEADERS += \ lstrCompressed.h \ diff --git a/src/plugins/streamers/lstream/runtime/capnp.pro b/src/plugins/streamers/lstream/runtime/capnp.pro index 62e198bf0..60e6923c9 100644 --- a/src/plugins/streamers/lstream/runtime/capnp.pro +++ b/src/plugins/streamers/lstream/runtime/capnp.pro @@ -7,6 +7,7 @@ include($$PWD/../../lstream.pri) include($$PWD/capnp.pri) TARGET = xcapnp +CONFIG += staticlib SOURCES = $$CAPNP_SOURCES HEADERS = $$CAPNP_HEADERS diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp.pro b/src/plugins/streamers/lstream/runtime/capnp/capnp.pro index af1df7782..6241259d7 100644 --- a/src/plugins/streamers/lstream/runtime/capnp/capnp.pro +++ b/src/plugins/streamers/lstream/runtime/capnp/capnp.pro @@ -10,6 +10,7 @@ include($$PWD/../../lstream.pri) include($$PWD/capnp.pri) TARGET = xcapnp +CONFIG += staticlib SOURCES = $$CAPNP_SOURCES HEADERS = $$CAPNP_HEADERS diff --git a/src/plugins/streamers/lstream/runtime/kj.pro b/src/plugins/streamers/lstream/runtime/kj.pro index 4725cde5a..cf4070edc 100644 --- a/src/plugins/streamers/lstream/runtime/kj.pro +++ b/src/plugins/streamers/lstream/runtime/kj.pro @@ -7,6 +7,7 @@ include($$PWD/../../lstream.pri) include($$PWD/kj.pri) TARGET = xkj +CONFIG += staticlib SOURCES = $$KJ_SOURCES HEADERS = $$KJ_HEADERS diff --git a/src/plugins/streamers/lstream/runtime/kj/kj.pro b/src/plugins/streamers/lstream/runtime/kj/kj.pro index 6378fcbc2..fbecaa238 100644 --- a/src/plugins/streamers/lstream/runtime/kj/kj.pro +++ b/src/plugins/streamers/lstream/runtime/kj/kj.pro @@ -10,6 +10,7 @@ include($$PWD/../../lstream.pri) include($$PWD/kj.pri) TARGET = xkj +CONFIG += staticlib SOURCES = $$KJ_SOURCES HEADERS = $$KJ_HEADERS