ATOMSOLV win32 compilation: initial version.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb2e6cc4039dcb2de36dd84f494c401cbce11ac6..de9a1c357c1f88784cbbfc1d5a7af10b5d916360 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,7 @@ INCLUDE(${QT_USE_FILE})
 FIND_PACKAGE(SalomeCAS)
 # VTK
 FIND_PACKAGE(SalomeVTK 6.0)
+FIND_PACKAGE(SalomePthread)
 
 # Find ATOMGEN
 # ===========

diff --git a/src/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx
index 7144bdc8bb2b6b156c67475009b6681414e2eb14..d2da3f53027995c1252901773c1f07b1f6daaafb 100755 (executable)
--- a/src/ATOMSOLV/ATOMSOLV.cxx
+++ b/src/ATOMSOLV/ATOMSOLV.cxx
@@ -17,13 +17,14 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-using namespace std;
 #include "ATOMSOLV.hxx"
 #include "ATOMSOLV_version.h"
 #include "utilities.h"
 
 #include <string>
 
+using namespace std;
+
 
 ATOMSOLV::ATOMSOLV(CORBA::ORB_ptr orb,
        PortableServer::POA_ptr poa,

diff --git a/src/ATOMSOLV/ATOMSOLV.hxx b/src/ATOMSOLV/ATOMSOLV.hxx
index ec5f83582dfdc6bdb8ee04a2305166d0372afdc5..04d1c465a249c622000586a33699e065c5e19962 100644 (file)
--- a/src/ATOMSOLV/ATOMSOLV.hxx
+++ b/src/ATOMSOLV/ATOMSOLV.hxx
@@ -27,7 +27,18 @@
 
 #include <map>
 
-class ATOMSOLV:
+#if defined WIN32
+#  if defined ATOMSOLV_EXPORTS || defined ATOMSOLVEngine_EXPORTS
+#    define ATOMSOLV_EXPORT __declspec( dllexport )
+#  else
+#    define ATOMSOLV_EXPORT __declspec( dllimport )
+#  endif
+#else
+#  define ATOMSOLV_EXPORT
+#endif
+
+
+class ATOMSOLV_EXPORT ATOMSOLV:
   public POA_ATOMSOLV_ORB::ATOMSOLV_Gen,
   public Engines_Component_i 
 {
@@ -50,6 +61,7 @@ private:
 };
 
 extern "C"
+ ATOMSOLV_EXPORT
 PortableServer::ObjectId * ATOMSOLVEngine_factory(CORBA::ORB_ptr orb,
                                                  PortableServer::POA_ptr poa,
                                                  PortableServer::ObjectId * contId,

diff --git a/src/ATOMSOLV/CMakeLists.txt b/src/ATOMSOLV/CMakeLists.txt
index a3fab59b066950afa5d51af807fe43fb1598426c..686033c84ce17ac8d836dc157f31b4cebbedcfc6 100755 (executable)
--- a/src/ATOMSOLV/CMakeLists.txt
+++ b/src/ATOMSOLV/CMakeLists.txt
@@ -17,20 +17,23 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
+  ${KERNEL_INCLUDE_DIRS}
   ${ATOMGEN_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
 )
 
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+  ${OMNIORB_DEFINITIONS}
+)
+
+
 # libraries to link to
 SET(_link_LIBRARIES
   ${ATOMGEN_SalomeIDLATOMGEN}

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI.h b/src/ATOMSOLVGUI/ATOMSOLVGUI.h
index 92acb5e44cb2a7a0e2925a48efa8c548dde5945b..fcb3cee1bb5e72c02692c3383cf76e0420bdf1db 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.h
@@ -20,6 +20,8 @@
 #ifndef _ATOMSOLVGUI_H_
 #define _ATOMSOLVGUI_H_
 
+#include "ATOMSOLVGUI_ATOMSOLVGUI.hxx"
+
 #include <SalomeApp_Module.h>
 
 #include <SALOMEconfig.h>
@@ -27,7 +29,7 @@
 
 class SalomeApp_Application;
 
-class ATOMSOLVGUI: public SalomeApp_Module
+class ATOMSOLVGUI_EXPORT ATOMSOLVGUI: public SalomeApp_Module
 {
   Q_OBJECT
 

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx
new file mode 100755 (executable)
index 0000000..a2cd427
--- /dev/null
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx
@@ -0,0 +1,39 @@
+// Copyright (C) 2007-2013  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
+//
+
+// File   : ATOMSOLVGUI_ATOMSOLVGUI.hxx
+// Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
+//
+#ifndef ATOMSOLVGUI_ATOMSOLVGUI_HXX
+#define ATOMSOLVGUI_ATOMSOLVGUI_HXX
+
+#if defined WIN32
+#  if defined ATOMSOLVGUI_EXPORTS || defined ATOMSOLV_EXPORTS
+#    define ATOMSOLVGUI_EXPORT __declspec( dllexport )
+#  else
+#    define ATOMSOLVGUI_EXPORT __declspec( dllimport )
+#  endif
+#else
+#  define ATOMSOLVGUI_EXPORT
+#endif
+
+#endif // ATOMSOLVGUI_ATOMSOLVGUI

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
index 8bd1c1ad50eb741ed4c82b065542746e9bd73fac..f14242ff29ee509cd45696ae5bf5f63bb8479e70 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
@@ -20,6 +20,8 @@
 #if !defined(ATOMSOLVGUI_DATAMODEL_H)
 #define ATOMSOLVGUI_DATAMODEL_H
 
+#include "ATOMSOLVGUI_ATOMSOLVGUI.hxx"
+
 #include <LightApp_DataModel.h>
 
 class CAM_Module;
@@ -28,7 +30,7 @@ class CAM_Module;
  * Class       : ATOMSOLVGUI_DataModel
  * Description : Data Model of ATOMIC component
  */
-class ATOMSOLVGUI_DataModel : public LightApp_DataModel
+class ATOMSOLVGUI_EXPORT ATOMSOLVGUI_DataModel : public LightApp_DataModel
 {
 public:
   ATOMSOLVGUI_DataModel ( CAM_Module* );

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
index ca230d95232cb74cb87d7f1a857de3a917ac8bc7..4ec0a168800b1524c015b4774aef41c8eb885ffb 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
@@ -20,6 +20,8 @@
 #if !defined(ATOMSOLVGUI_DATAOBJECT_H)
 #define ATOMSOLVGUI_DATAOBJECT_H
 
+#include "ATOMSOLVGUI_ATOMSOLVGUI.hxx"
+
 #include <LightApp_DataObject.h>
 
 #include <qstring.h>
@@ -34,7 +36,7 @@
  *               If it is an Atom then myIndex field is >= 0
  *               For Molecule myIndex equals to -1.
  */
-class ATOMSOLVGUI_DataObject : public virtual LightApp_DataObject
+class ATOMSOLVGUI_EXPORT ATOMSOLVGUI_DataObject : public virtual LightApp_DataObject
 {
 public:
   ATOMSOLVGUI_DataObject ( SUIT_DataObject*, int MoleculeIndex, int AtomIndex = -1 );
@@ -59,7 +61,7 @@ private:
   int                        myAtomIndex;
 };
 
-class ATOMSOLVGUI_ModuleObject : public ATOMSOLVGUI_DataObject,
+class ATOMSOLVGUI_EXPORT ATOMSOLVGUI_ModuleObject : public ATOMSOLVGUI_DataObject,
                                  public LightApp_ModuleObject
 {
 public:

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
index 05e4c3dbb8e9973cc71bd012c20c735876705236..41e7d8482718cd9572e488a8dccf984642bfba96 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
@@ -20,6 +20,8 @@
 #ifndef ATOMSOLVGUI_DISPLAYER_HEADER
 #define ATOMSOLVGUI_DISPLAYER_HEADER
 
+#include "ATOMSOLVGUI_ATOMSOLVGUI.hxx"
+
 #include <LightApp_Displayer.h>
 
 #include <qstringlist.h>
@@ -27,7 +29,7 @@
 
 class SALOME_Actor;
 
-class ATOMSOLVGUI_Displayer : public LightApp_Displayer
+class ATOMSOLVGUI_EXPORT ATOMSOLVGUI_Displayer : public LightApp_Displayer
 {
 public:
   ATOMSOLVGUI_Displayer();

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
index 5502ef2de11c127d2bc2532f40e815ee79c15a18..a3d4de40eabe35fb51d6e86f2c24d835be21cd7b 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
@@ -20,9 +20,11 @@
 #ifndef ATOMSOLVGUI_SELECTION_HeaderFile
 #define ATOMSOLVGUI_SELECTION_HeaderFile
 
+#include "ATOMSOLVGUI_ATOMSOLVGUI.hxx"
+
 #include <LightApp_Selection.h>
 
-class ATOMSOLVGUI_Selection : public LightApp_Selection
+class ATOMSOLVGUI_EXPORT ATOMSOLVGUI_Selection : public LightApp_Selection
 {
 public:
   ATOMSOLVGUI_Selection();

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
index e92dc175a18ae3f8524f05dbde74ada1f081d530..d94af4ff54bb9d615d3da3ac8005665dba5d9256 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
@@ -20,6 +20,8 @@
 #ifndef TRANSPARENCYDLG_H
 #define TRANSPARENCYDLG_H
 
+#include "ATOMSOLVGUI_ATOMSOLVGUI.hxx"
+
 #include <qdialog.h>
 #include <qstringlist.h>
 
@@ -29,7 +31,7 @@ class QSlider;
 // class    : ATOMSOLVGUI_TransparencyDlg
 // purpose  : dialog box that allows to modify transparency of displayed objects
 //=================================================================================
-class ATOMSOLVGUI_TransparencyDlg : public QDialog
+class ATOMSOLVGUI_EXPORT ATOMSOLVGUI_TransparencyDlg : public QDialog
 { 
     Q_OBJECT
 

diff --git a/src/ATOMSOLVGUI/CMakeLists.txt b/src/ATOMSOLVGUI/CMakeLists.txt
index b884c59779e5d5f7a4c960c6672bec61913c1e3f..fd4551719f52b030bf2f42b6cc57448e7c30e231 100644 (file)
--- a/src/ATOMSOLVGUI/CMakeLists.txt
+++ b/src/ATOMSOLVGUI/CMakeLists.txt
@@ -22,6 +22,7 @@ INCLUDE(UseQt4Ext)
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
+  ${PTHREAD_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS} 
@@ -36,7 +37,6 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
-  ${OMNIORB_DEFINITIONS}
   ${CAS_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
 )