From: rnv <rnv@opencascade.com>
Date: Tue, 1 Apr 2014 09:28:48 +0000 (+0400)
Subject: Compilation on Windows platform.
X-Git-Tag: V7_4_0a1~11
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=9acd4347a6c7488c3ead4c68861b0944e83e545f;hp=683b9e264c22c081ba5cf3c20639480d03d1d994

Compilation on Windows platform.
---

diff --git a/src/DriverSTL/CMakeLists.txt b/src/DriverSTL/CMakeLists.txt
index 58c7147fe..fa0a8139d 100644
--- a/src/DriverSTL/CMakeLists.txt
+++ b/src/DriverSTL/CMakeLists.txt
@@ -45,6 +45,7 @@ SET(_link_LIBRARIES
   ${KERNEL_SALOMEBasics}
   MeshDriver
   SMDS
+  SMESHUtils
 )
 
 SET(_link_LIBRARIES_bin
diff --git a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
index ee4da4a6f..a250b428a 100644
--- a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
+++ b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
@@ -22,17 +22,17 @@
 
 #include "DriverSTL_R_SMDS_Mesh.h"
 
-#include "SMDS_Mesh.hxx"
-#include "SMDS_MeshElement.hxx"
-#include "SMDS_MeshNode.hxx"
-#include "SMESH_File.hxx"
-
-#include <gp_Pnt.hxx>
 #include <Basics_Utils.hxx>
 
+#include <gp_Pnt.hxx>
 #include <NCollection_DataMap.hxx>
 #include <Standard_NoMoreObject.hxx>
 
+#include "SMDS_Mesh.hxx"
+#include "SMDS_MeshElement.hxx"
+#include "SMDS_MeshNode.hxx"
+#include "SMESH_File.hxx"
+
 namespace
 {
   struct Hasher
diff --git a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
index 5499183cb..2ac7ca5da 100644
--- a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
+++ b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
@@ -22,6 +22,12 @@
 
 #include "DriverSTL_W_SMDS_Mesh.h"
 
+#ifdef WIN32
+#define NOMINMAX
+#endif
+
+#include <Basics_Utils.hxx>
+
 #include "SMDS_FaceOfNodes.hxx"
 #include "SMDS_IteratorOnIterators.hxx"
 #include "SMDS_Mesh.hxx"
@@ -32,8 +38,6 @@
 #include "SMESH_File.hxx"
 #include "SMESH_TypeDefs.hxx"
 
-#include <Basics_Utils.hxx>
-
 //#include "utilities.h"
 
 #include <limits>
diff --git a/src/SMESHUtils/CMakeLists.txt b/src/SMESHUtils/CMakeLists.txt
index 1281d9aca..5261c5d7f 100644
--- a/src/SMESHUtils/CMakeLists.txt
+++ b/src/SMESHUtils/CMakeLists.txt
@@ -42,6 +42,7 @@ SET(_link_LIBRARIES
   ${CAS_TKG3d}
   ${CAS_TKGeomBase}
   ${CAS_TKGeomAlgo}
+  ${Boost_LIBRARIES}
   SMESHDS
 )
 
diff --git a/src/SMESHUtils/SMESH_File.cxx b/src/SMESHUtils/SMESH_File.cxx
index c31c2e8bc..d75cd108a 100644
--- a/src/SMESHUtils/SMESH_File.cxx
+++ b/src/SMESHUtils/SMESH_File.cxx
@@ -171,7 +171,7 @@ long SMESH_File::size()
   if ( _size >= 0 ) return _size; // size of an open file
 
   boost::system::error_code err;
-  uintmax_t size = boofs::file_size( _name, err );
+  boost::uintmax_t size = boofs::file_size( _name, err );
   _error = err.message();
 
   return err ? -1 : (long) size;