From 025c6f06946e7551f97f2d65602562840653d438 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Mon, 21 Jun 2021 22:02:17 +0200 Subject: [PATCH] Agressive windows porting --- src/gui/CMakeLists.txt | 1 + src/gui/ParamsConfig.hxx | 3 ++- src/gui/PathsConfig.hxx | 3 ++- src/gui/QuickConfig.hxx | 3 ++- src/gui/ResourceWidget.hxx | 3 ++- src/gui/ydefxguiExports.hxx | 30 ++++++++++++++++++++++++++++++ 6 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 src/gui/ydefxguiExports.hxx diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 8774193..c3babea 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -37,6 +37,7 @@ SET(YDEFXGUI_SOURCES SET(YDEFXGUI_HEADERS ResourceWidget.hxx + ydefxguiExports.hxx ) SET(YDEFXGUI_link_LIBRARIES diff --git a/src/gui/ParamsConfig.hxx b/src/gui/ParamsConfig.hxx index a66ada0..a394d2c 100644 --- a/src/gui/ParamsConfig.hxx +++ b/src/gui/ParamsConfig.hxx @@ -18,12 +18,13 @@ // #ifndef IDEFX_ParamsConfigWidget_HXX #define IDEFX_ParamsConfigWidget_HXX +#include "ydefxguiExports.hxx" #include "JobParametersProxy.hxx" #include namespace ydefx { -class ParamsConfigWidget: public QScrollArea +class YDEFXGUI_EXPORT ParamsConfigWidget: public QScrollArea { Q_OBJECT public: diff --git a/src/gui/PathsConfig.hxx b/src/gui/PathsConfig.hxx index d87247b..918abd5 100644 --- a/src/gui/PathsConfig.hxx +++ b/src/gui/PathsConfig.hxx @@ -18,12 +18,13 @@ // #ifndef IDEFX_PathsConfigWidget_HXX #define IDEFX_PathsConfigWidget_HXX +#include "ydefxguiExports.hxx" #include "JobParametersProxy.hxx" #include namespace ydefx { -class PathsConfigWidget: public QScrollArea +class YDEFXGUI_EXPORT PathsConfigWidget: public QScrollArea { Q_OBJECT public: diff --git a/src/gui/QuickConfig.hxx b/src/gui/QuickConfig.hxx index 8d031a8..a1ab935 100644 --- a/src/gui/QuickConfig.hxx +++ b/src/gui/QuickConfig.hxx @@ -18,12 +18,13 @@ // #ifndef IDEFX_QuickConfigWidget_HXX #define IDEFX_QuickConfigWidget_HXX +#include "ydefxguiExports.hxx" #include "JobParametersProxy.hxx" #include namespace ydefx { -class QuickConfigWidget: public QScrollArea +class YDEFXGUI_EXPORT QuickConfigWidget: public QScrollArea { Q_OBJECT public: diff --git a/src/gui/ResourceWidget.hxx b/src/gui/ResourceWidget.hxx index 86ea843..bc96557 100644 --- a/src/gui/ResourceWidget.hxx +++ b/src/gui/ResourceWidget.hxx @@ -18,12 +18,13 @@ // #ifndef IDEFX_RESOURCEWIDGET_HXX #define IDEFX_RESOURCEWIDGET_HXX +#include "ydefxguiExports.hxx" #include "JobParametersProxy.hxx" #include namespace ydefx { -class ResourceWidget: public QTabWidget +class YDEFXGUI_EXPORT ResourceWidget: public QTabWidget { Q_OBJECT public: diff --git a/src/gui/ydefxguiExports.hxx b/src/gui/ydefxguiExports.hxx new file mode 100644 index 0000000..4ef91df --- /dev/null +++ b/src/gui/ydefxguiExports.hxx @@ -0,0 +1,30 @@ +// Copyright (C) 2021 EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#pragma once + +#ifdef WIN32 +# if defined(ydefxgui_EXPORTS) || defined(ydefxgui_EXPORTS) +# define YDEFXGUI_EXPORT __declspec( dllexport ) +# else +# define YDEFXGUI_EXPORT __declspec( dllimport ) +# endif +#else +# define YDEFXGUI_EXPORT +#endif -- 2.39.2