Salome HOME
Compilation on Windows platform.
authorrnv <rnv@opencascade.com>
Tue, 1 Apr 2014 09:28:48 +0000 (13:28 +0400)
committerrnv <rnv@opencascade.com>
Tue, 1 Apr 2014 09:28:48 +0000 (13:28 +0400)
src/DriverSTL/CMakeLists.txt
src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
src/SMESHUtils/CMakeLists.txt
src/SMESHUtils/SMESH_File.cxx

index 58c7147..fa0a813 100644 (file)
@@ -45,6 +45,7 @@ SET(_link_LIBRARIES
   ${KERNEL_SALOMEBasics}
   MeshDriver
   SMDS
+  SMESHUtils
 )
 
 SET(_link_LIBRARIES_bin
index ee4da4a..a250b42 100644 (file)
 
 #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
index 5499183..2ac7ca5 100644 (file)
 
 #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>
index 1281d9a..5261c5d 100644 (file)
@@ -42,6 +42,7 @@ SET(_link_LIBRARIES
   ${CAS_TKG3d}
   ${CAS_TKGeomBase}
   ${CAS_TKGeomAlgo}
+  ${Boost_LIBRARIES}
   SMESHDS
 )
 
index c31c2e8..d75cd10 100644 (file)
@@ -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;