From: rnv <rnv@opencascade.com>
Date: Fri, 27 Jan 2012 08:17:54 +0000 (+0000)
Subject: Build SALOME on win32 platform.
X-Git-Tag: V6_5_0a1~72
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=350d11ce3acb165140e53c815bf50d33323dafe3;p=modules%2Fgui.git

Build SALOME on win32 platform.
---

diff --git a/tools/vtkEDFOverloads/Makefile.am b/tools/vtkEDFOverloads/Makefile.am
index bd6f5ec5c..057144728 100755
--- a/tools/vtkEDFOverloads/Makefile.am
+++ b/tools/vtkEDFOverloads/Makefile.am
@@ -26,7 +26,8 @@ libparaview_LTLIBRARIES = libvtkEDFOverloads.la
 lib_LTLIBRARIES = libvtkTools.la
 
 salomeinclude_HEADERS = vtkEDFCutter.h \
-	vtkEDFFactory.h
+			vtkEDFFactory.h \
+			vtkEDFOverloadsDefines.h
 
 dist_libvtkEDFOverloads_la_SOURCES = vtkEDFFactory.cxx
 dist_libvtkTools_la_SOURCES = vtkEDFCutter.cxx
@@ -35,4 +36,5 @@ libvtkEDFOverloads_la_CPPFLAGS = $(VTK_INCLUDES)
 libvtkTools_la_CPPFLAGS = $(VTK_INCLUDES)
 
 libvtkEDFOverloads_la_LDFLAGS = $(VTK_LIBS)
+libvtkEDFOverloads_la_LIBADD = libvtkTools.la
 libvtkTools_la_LDFLAGS = $(VTK_LIBS)
\ No newline at end of file
diff --git a/tools/vtkEDFOverloads/vtkEDFCutter.h b/tools/vtkEDFOverloads/vtkEDFCutter.h
index c01dd3994..d3e9f2fda 100755
--- a/tools/vtkEDFOverloads/vtkEDFCutter.h
+++ b/tools/vtkEDFOverloads/vtkEDFCutter.h
@@ -20,9 +20,10 @@
 #ifndef __vtkEDFCutter_h__
 #define __vtkEDFCutter_h__
 
+#include "vtkEDFOverloadsDefines.h"
 #include "vtkCutter.h"
 
-class VTK_EXPORT vtkEDFCutter : public vtkCutter
+class VTKTOOLS_EXPORT vtkEDFCutter : public vtkCutter
 {
 public :
   static vtkEDFCutter* New();
diff --git a/tools/vtkEDFOverloads/vtkEDFFactory.h b/tools/vtkEDFOverloads/vtkEDFFactory.h
index d572c4413..fe6486cfd 100755
--- a/tools/vtkEDFOverloads/vtkEDFFactory.h
+++ b/tools/vtkEDFOverloads/vtkEDFFactory.h
@@ -18,9 +18,10 @@
 #ifndef __vtkEDFFactory_h
 #define __vtkEDFFactory_h
 
+#include "vtkEDFOverloadsDefines.h"
 #include "vtkObjectFactory.h"
 
-class VTK_EXPORT vtkEDFFactory : public vtkObjectFactory
+class VTKEDF_OVERLOADS_EXPORT vtkEDFFactory : public vtkObjectFactory
 {
 public:
 // Methods from vtkObject
diff --git a/tools/vtkEDFOverloads/vtkEDFOverloadsDefines.h b/tools/vtkEDFOverloads/vtkEDFOverloadsDefines.h
new file mode 100755
index 000000000..30d3e4f96
--- /dev/null
+++ b/tools/vtkEDFOverloads/vtkEDFOverloadsDefines.h
@@ -0,0 +1,44 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// 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
+//
+
+#ifndef VTKEDF_OVERLOADS_DEFINES_H
+#define VTKEDF_OVERLOADS_DEFINES_H
+
+#if defined WIN32
+#  if defined VTKEDF_OVERLOADS_EXPORTS || defined vtkEDFOverloads_EXPORTS
+#    define VTKEDF_OVERLOADS_EXPORT __declspec( dllexport )
+#  else
+#    define VTKEDF_OVERLOADS_EXPORT __declspec( dllimport )
+#  endif
+
+#  if defined VTKTOOLS_EXPORTS || defined vtkTools_EXPORTS
+#    define VTKTOOLS_EXPORT __declspec( dllexport )
+#  else
+#    define VTKTOOLS_EXPORT __declspec( dllimport )
+#  endif
+
+#else
+#  define VTKEDF_OVERLOADS_EXPORT
+#  define VTKTOOLS_EXPORT
+#endif //WIN32
+
+#endif //VTKEDF_OVERLOADS_DEFINES_H
\ No newline at end of file