fix new vs2013 warnings.

2020-03-18 21:32:17 +01:00
parent 097d2faeea
commit 9aa5e3e04f
4 changed files with 5 additions and 3 deletions
--- a/code/FBX/FBXTokenizer.h
+++ b/code/FBX/FBXTokenizer.h
@@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include "FBXCompileConfig.h"
 #include <assimp/ai_assert.h>
+#include <assimp/defs.h>
 #include <vector>
 #include <string>

--- a/code/M3D/m3d.h
+++ b/code/M3D/m3d.h
@@ -101,9 +101,9 @@ typedef uint16_t M3D_INDEX;

 #ifdef _WIN32
 #    pragma warning(push)
-#    pragma warning(disable : 4127 4505 4244 4403 5744 4701 4703)
+#    pragma warning(disable : 4100 4127 4189 4505 4244 4403  4701 4703)
 #    if (_MSC_VER > 1800 )
-#        pragma warning(disable : 5573 )
+#        pragma warning(disable : 5573 5744)
 #    endif
 #endif // _WIN32