Win32 compatibility

diff --git a/src/DependencyTree/CMakeLists.txt b/src/DependencyTree/CMakeLists.txt
index 91580628d20a5f5fcb136779f174cacc338ca4cd..7a4cce20388ad11d9196c1f25d1c52d9a004e9ec 100644 (file)
--- a/src/DependencyTree/CMakeLists.txt
+++ b/src/DependencyTree/CMakeLists.txt
@@ -25,6 +25,7 @@ INCLUDE(UseQt4Ext)
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
   ${GUI_INCLUDE_DIRS}
+  ${CAS_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/GEOMGUI
   ${PROJECT_SOURCE_DIR}/src/GEOMBase
   ${PROJECT_SOURCE_DIR}/src/GEOM
@@ -39,6 +40,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${GUI_DEFINITIONS}
+  ${OMNIORB_DEFINITIONS}
   ${CAS_DEFINITIONS}
   )
 
@@ -49,6 +51,7 @@ SET(_link_LIBRARIES
   ${GUI_GraphicsView}
   GEOM
   GEOMBase
+  GEOMToolsGUI
   )
 
 # --- headers ---
@@ -57,6 +60,7 @@ SET(DependencyTree_HEADERS
   DependencyTree_Arrow.h
   DependencyTree_Object.h
   DependencyTree_Selector.h
+  DependencyTree.h
   )
 
 # header files / to be processed by moc

diff --git a/src/DependencyTree/DependencyTree.h b/src/DependencyTree/DependencyTree.h
new file mode 100644 (file)
index 0000000..4f47eb3
--- /dev/null
+++ b/src/DependencyTree/DependencyTree.h
@@ -0,0 +1,33 @@
+// Copyright (C) 2014  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// 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
+//
+
+#ifndef DEPENDENCYTREE_H
+#define DEPENDENCYTREE_H
+
+#if defined WIN32
+#  if defined DEPENDENCYTREE_EXPORTS || defined DependencyTree_EXPORTS
+#    define DEPENDENCYTREE_EXPORT __declspec( dllexport )
+#  else
+#    define DEPENDENCYTREE_EXPORT __declspec( dllimport )
+#  endif
+#else
+#  define DEPENDENCYTREE_EXPORT
+#endif
+
+#endif // DEPENDENCYTREE_H

diff --git a/src/DependencyTree/DependencyTree_Arrow.cxx b/src/DependencyTree/DependencyTree_Arrow.cxx
index 81784d1a0ed2e8a4b58d217ea23540aff1003945..945b631bca2f487c87a9e7109b3d055ec4e8c8ef 100644 (file)
--- a/src/DependencyTree/DependencyTree_Arrow.cxx
+++ b/src/DependencyTree/DependencyTree_Arrow.cxx
@@ -28,6 +28,10 @@
 // Qt includes
 #include <QPainter>
 
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#endif
+
 #include <math.h>
 
 const qreal arrowSize = 20;

diff --git a/src/DependencyTree/DependencyTree_Arrow.h b/src/DependencyTree/DependencyTree_Arrow.h
index 0877556515c7c1fe6b3cdf7edff938fbbd8eb813..9f73bfe51c87e6f7d3efafe9ecb89387aaa25042 100644 (file)
--- a/src/DependencyTree/DependencyTree_Arrow.h
+++ b/src/DependencyTree/DependencyTree_Arrow.h
@@ -22,9 +22,11 @@
 
 #include <QGraphicsLineItem>
 
+#include "DependencyTree.h"
+
 class DependencyTree_Object;
 
-class DependencyTree_Arrow : public QGraphicsLineItem
+class DEPENDENCYTREE_EXPORT DependencyTree_Arrow : public QGraphicsLineItem
 {
 
 public:

diff --git a/src/DependencyTree/DependencyTree_Object.h b/src/DependencyTree/DependencyTree_Object.h
index fae775edcff3765a2c4e820cc195ec6863ef60c9..db2c4a22b538413d431f1a39822010c781190a23 100644 (file)
--- a/src/DependencyTree/DependencyTree_Object.h
+++ b/src/DependencyTree/DependencyTree_Object.h
@@ -28,7 +28,9 @@
 
 #include <QPen>
 
-class DependencyTree_Object: public GraphicsView_Object
+#include "DependencyTree.h"
+
+class DEPENDENCYTREE_EXPORT DependencyTree_Object: public GraphicsView_Object
 {
 
 public:

diff --git a/src/DependencyTree/DependencyTree_Selector.h b/src/DependencyTree/DependencyTree_Selector.h
index b5096920a4737c6536492911f7e0a424dca1d4db..5203d4d55e027c00ed7865fb42cecf81db7ddaa6 100644 (file)
--- a/src/DependencyTree/DependencyTree_Selector.h
+++ b/src/DependencyTree/DependencyTree_Selector.h
@@ -22,10 +22,12 @@
 
 #include <LightApp_GVSelector.h>
 
+#include "DependencyTree.h"
+
 class DependencyTree_ViewModel;
 class DependencyTree_View;
 
-class DependencyTree_Selector: public LightApp_GVSelector
+class DEPENDENCYTREE_EXPORT DependencyTree_Selector: public LightApp_GVSelector
 {
 
 public:

diff --git a/src/DependencyTree/DependencyTree_View.h b/src/DependencyTree/DependencyTree_View.h
index 6c606d40118e4bd109d3b5104266fdac830de612..298933729ecbddf6785d3e3b3aa2266f04a617bd 100644 (file)
--- a/src/DependencyTree/DependencyTree_View.h
+++ b/src/DependencyTree/DependencyTree_View.h
@@ -35,6 +35,8 @@
 #include <QSpinBox>
 #include <QCheckBox>
 
+#include "DependencyTree.h"
+
 class DependencyTree_Object;
 class DependencyTree_Arrow;
 class DependencyTree_View;
@@ -42,7 +44,7 @@ class DependencyTree_View;
 typedef std::map<std::string,DependencyTree_Object*> EntryObjectMap;
 typedef std::map<std::pair<DependencyTree_Object*,DependencyTree_Object*>,DependencyTree_Arrow*> ArrowsInfo;
 
-class DependencyTree_View: public GraphicsView_ViewPort
+class DEPENDENCYTREE_EXPORT DependencyTree_View: public GraphicsView_ViewPort
 {
   Q_OBJECT
 

diff --git a/src/DependencyTree/DependencyTree_ViewModel.h b/src/DependencyTree/DependencyTree_ViewModel.h
index afbfc0da03049ef21cc7882213d78b94ece034f3..ffc3d76079583a7d52a2f47320b68c82e437b0e5 100644 (file)
--- a/src/DependencyTree/DependencyTree_ViewModel.h
+++ b/src/DependencyTree/DependencyTree_ViewModel.h
@@ -22,7 +22,9 @@
 
 #include <GraphicsView_Viewer.h>
 
-class DependencyTree_ViewModel: public GraphicsView_Viewer
+#include "DependencyTree.h"
+
+class DEPENDENCYTREE_EXPORT DependencyTree_ViewModel: public GraphicsView_Viewer
 {
 
   Q_OBJECT