@@ -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>
@@ -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
@@ -75,6 +75,7 @@ OF SUCH DAMAGE.
#include <stdio.h>
#include "o3dgcCommon.h"
namespace o3dgc
{
@@ -158,7 +158,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif
#ifdef _MSC_VER
-# pragma warning(disable : 4521 4512 4714 4127)
+# pragma warning(disable : 4521 4512 4714 4127 4351 4510 )
# ifdef ASSIMP_BUILD_DLL_EXPORT
# pragma warning (disable : 4251)