From 0afb54e0912a2406946a671cae01c7167366fbfd Mon Sep 17 00:00:00 2001 From: abd Date: Mon, 27 Oct 2008 11:51:16 +0000 Subject: [PATCH] Export classes for right compilation on Win32 platform --- src/GUI/Makefile.am | 1 + src/GUI/NETGENPluginGUI.h | 36 +++++++++++++++++++++ src/GUI/NETGENPluginGUI_HypothesisCreator.h | 10 +----- src/GUI/NETGENPluginGUI_SimpleCreator.h | 6 ++-- 4 files changed, 42 insertions(+), 11 deletions(-) create mode 100755 src/GUI/NETGENPluginGUI.h diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am index c2170ce..89248ca 100644 --- a/src/GUI/Makefile.am +++ b/src/GUI/Makefile.am @@ -33,6 +33,7 @@ lib_LTLIBRARIES = libNETGENPluginGUI.la dist_libNETGENPluginGUI_la_SOURCES = \ NETGENPluginGUI.cxx \ + NETGENPluginGUI.h \ NETGENPluginGUI_HypothesisCreator.h \ NETGENPluginGUI_HypothesisCreator.cxx \ NETGENPluginGUI_SimpleCreator.h \ diff --git a/src/GUI/NETGENPluginGUI.h b/src/GUI/NETGENPluginGUI.h new file mode 100755 index 0000000..8835cdb --- /dev/null +++ b/src/GUI/NETGENPluginGUI.h @@ -0,0 +1,36 @@ +// NETGENPlugin GUI: GUI for plugged-in mesher NETGENPlugin +// +// Copyright (C) 2003 CEA +// +// 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. +// +// 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 +// +// +// +// File : NETGENPluginGUI.h +// Author : Alexander A. BORODIN +// Module : NETGENPlugin +// $Header: + +#ifdef WIN32 + #ifdef NETGENPLUGIN_GUI_EXPORTS + #define NETGENPLUGIN_GUI_EXPORT __declspec( dllexport ) + #else + #define NETGENPLUGIN_GUI_EXPORT __declspec( dllimport ) + #endif +#else + #define NETGENPLUGIN_GUI_EXPORT +#endif diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h index 90678bc..8eaefe0 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h @@ -28,15 +28,7 @@ #ifndef NETGENPLUGINGUI_HypothesisCreator_HeaderFile #define NETGENPLUGINGUI_HypothesisCreator_HeaderFile -#ifdef WIN32 - #ifdef NETGENPLUGIN_GUI_EXPORTS - #define NETGENPLUGIN_GUI_EXPORT __declspec( dllexport ) - #else - #define NETGENPLUGIN_GUI_EXPORT __declspec( dllimport ) - #endif -#else - #define NETGENPLUGIN_GUI_EXPORT -#endif +#include "NETGENPluginGUI.h" #include diff --git a/src/GUI/NETGENPluginGUI_SimpleCreator.h b/src/GUI/NETGENPluginGUI_SimpleCreator.h index 483bb4e..d4ca93b 100644 --- a/src/GUI/NETGENPluginGUI_SimpleCreator.h +++ b/src/GUI/NETGENPluginGUI_SimpleCreator.h @@ -24,8 +24,9 @@ #ifndef NETGENPluginGUI_SimpleCreator_H #define NETGENPluginGUI_SimpleCreator_H + +#include "NETGENPluginGUI.h" // SMESH includes -#include "NETGENPlugin_Defs.hxx" #include class QCheckBox; @@ -34,7 +35,8 @@ class QRadioButton; class QtxIntSpinBox; class SMESHGUI_SpinBox; -class NETGENPLUGIN_EXPORT NETGENPluginGUI_SimpleCreator : public SMESHGUI_GenericHypothesisCreator +class NETGENPLUGIN_GUI_EXPORT NETGENPluginGUI_SimpleCreator : + public SMESHGUI_GenericHypothesisCreator { Q_OBJECT -- 2.39.2