Kim Kulling 5 лет назад
Родитель
Сommit
097d2faeea
4 измененных файлов с 16 добавлено и 3 удалено
  1. 5 2
      code/Common/Exporter.cpp
  2. 3 0
      code/Common/Subdivision.cpp
  3. 4 1
      code/M3D/m3d.h
  4. 4 0
      code/MDL/HalfLife/HL1MDLLoader.cpp

+ 5 - 2
code/Common/Exporter.cpp

@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -76,6 +74,11 @@ Here we implement only the C++ interface (Assimp::Exporter).
 
 namespace Assimp {
 
+#ifdef _WIN32
+#    pragma warning( disable : 4800 ) 
+#endif // _WIN32
+
+
 // PostStepRegistry.cpp
 void GetPostProcessingStepInstanceList(std::vector< BaseProcess* >& out);
 

+ 3 - 0
code/Common/Subdivision.cpp

@@ -53,6 +53,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 void mydummy() {}
 
+#ifdef _WIN32
+#    pragma warning( disable : 4709 ) 
+#endif // _WIN32
 // ------------------------------------------------------------------------------------------------
 /** Subdivider stub class to implement the Catmull-Clarke subdivision algorithm. The
  *  implementation is basing on recursive refinement. Directly evaluating the result is also

+ 4 - 1
code/M3D/m3d.h

@@ -101,7 +101,10 @@ typedef uint16_t M3D_INDEX;
 
 #ifdef _WIN32
 #    pragma warning(push)
-#    pragma warning(disable : 4127 5573 4505 4244 4403 5744 4701 4703)
+#    pragma warning(disable : 4127 4505 4244 4403 5744 4701 4703)
+#    if (_MSC_VER > 1800 )
+#        pragma warning(disable : 5573 )
+#    endif
 #endif // _WIN32
 
 /*** File format structures ***/

+ 4 - 0
code/MDL/HalfLife/HL1MDLLoader.cpp

@@ -68,6 +68,10 @@ namespace Assimp {
 namespace MDL {
 namespace HalfLife {
 
+#ifdef _WIN32
+#    pragma warning(disabe : 4706) 
+#endif // _WIN32
+
 // ------------------------------------------------------------------------------------------------
 HL1MDLLoader::HL1MDLLoader(
     aiScene *scene,