From 4f602bb394185d175befb3f8d1ddd8b325e36984 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 18 Jun 2018 00:06:38 +0200 Subject: [PATCH] WIP: fixes for Windows build. --- src/lay/lay/lay.pro | 5 ++++- src/plugins/db_plugin.pri | 6 ++++++ src/plugins/lay_plugin.pri | 6 ++++++ src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.cc | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro index 32325e7e9..ef029a550 100644 --- a/src/lay/lay/lay.pro +++ b/src/lay/lay/lay.pro @@ -196,7 +196,10 @@ INCLUDEPATH += $$QTBASIC_INC DEPENDPATH += $$QTBASIC_INC equals(HAVE_QTBINDINGS, "1") { - LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtXml + LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtXml -lklayout_QtCore + equals(HAVE_QT5, "1") { + LIBS += -lklayout_QtWidgets + } } INCLUDEPATH += $$RBA_INC diff --git a/src/plugins/db_plugin.pri b/src/plugins/db_plugin.pri index 56657a942..471c0a633 100644 --- a/src/plugins/db_plugin.pri +++ b/src/plugins/db_plugin.pri @@ -8,3 +8,9 @@ DEPENDPATH += $$DB_INC $$TL_INC $$GSI_INC $$PWD/common LIBS += -L$$DESTDIR/.. -lklayout_db -lklayout_tl -lklayout_gsi DEFINES += MAKE_DB_PLUGIN_LIBRARY + +win32 { + # to avoid the major version being appended to the dll name - in this case -lxyz won't link it again + # because the library is called xyx0.dll. + CONFIG += skip_target_version_ext +} diff --git a/src/plugins/lay_plugin.pri b/src/plugins/lay_plugin.pri index 3a36cc445..19cad3598 100644 --- a/src/plugins/lay_plugin.pri +++ b/src/plugins/lay_plugin.pri @@ -8,3 +8,9 @@ DEPENDPATH += $$DB_INC $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAY_INC $$PWD/common LIBS += -L$$DESTDIR/.. -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_lay DEFINES += MAKE_LAY_PLUGIN_LIBRARY + +win32 { + # to avoid the major version being appended to the dll name - in this case -lxyz won't link it again + # because the library is called xyx0.dll. + CONFIG += skip_target_version_ext +} diff --git a/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.cc b/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.cc index 681818a42..0fc5d2372 100644 --- a/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.cc +++ b/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.cc @@ -27,7 +27,7 @@ namespace db { -DB_PUBLIC std::string net_tracer_component_name ("connectivity"); +DB_PLUGIN_PUBLIC std::string net_tracer_component_name ("connectivity"); // ----------------------------------------------------------------------------------------- // NetTracerLayerExpressionInfo implementation