closes https://github.com/assimp/assimp/issues/3252: fix build.
parent
a211aff522
commit
9aa468262f
|
@ -321,7 +321,7 @@ public:
|
|||
struct Face : public FaceWithSmoothingGroup {
|
||||
};
|
||||
|
||||
#ifdef _WIN32
|
||||
#if _MSC_VER > 1920
|
||||
#pragma warning(disable : 4315)
|
||||
#endif
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
#include "AssetLib/Step/STEPFile.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#if _MSC_VER > 1920
|
||||
# pragma warning( disable : 4512 )
|
||||
#endif // _WIN32
|
||||
|
||||
|
|
|
@ -85,7 +85,9 @@ typedef uint16_t M3D_INDEX;
|
|||
#define M3D_BONEMAXLEVEL 8
|
||||
#endif
|
||||
#ifndef _MSC_VER
|
||||
#ifndef _inline
|
||||
#define _inline __inline__
|
||||
#endif
|
||||
#define _pack __attribute__((packed))
|
||||
#define _unused __attribute__((unused))
|
||||
#else
|
||||
|
@ -99,7 +101,7 @@ typedef uint16_t M3D_INDEX;
|
|||
#define _register
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#if _MSC_VER > 1920
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4100 4127 4189 4505 4244 4403 4701 4703)
|
||||
# if (_MSC_VER > 1800 )
|
||||
|
|
|
@ -68,7 +68,7 @@ namespace Assimp {
|
|||
namespace MDL {
|
||||
namespace HalfLife {
|
||||
|
||||
#ifdef _WIN32
|
||||
#if _MSC_VER > 1920
|
||||
# pragma warning(disable : 4706)
|
||||
#endif // _WIN32
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
#include <assimp/DefaultLogger.hpp>
|
||||
|
||||
#ifdef _WIN32
|
||||
#if _MSC_VER > 1920
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4127 4456 4245 4512 )
|
||||
#endif // _WIN32
|
||||
|
@ -727,7 +727,7 @@ struct InternGenericConvert<Maybe<T>> {
|
|||
}
|
||||
};
|
||||
|
||||
#ifdef _WIN32
|
||||
#if _MSC_VER > 1920
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4127)
|
||||
#endif // _WIN32
|
||||
|
@ -960,7 +960,7 @@ private:
|
|||
const EXPRESS::ConversionSchema *schema;
|
||||
};
|
||||
|
||||
#ifdef _WIN32
|
||||
#if _MSC_VER > 1920
|
||||
#pragma warning(pop)
|
||||
#endif // _WIN32
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ Here we implement only the C++ interface (Assimp::Exporter).
|
|||
|
||||
namespace Assimp {
|
||||
|
||||
#ifdef _WIN32
|
||||
#if _MSC_VER > 1920
|
||||
# pragma warning( disable : 4800 )
|
||||
#endif // _WIN32
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
using namespace Assimp;
|
||||
void mydummy() {}
|
||||
|
||||
#ifdef _WIN32
|
||||
#if _MSC_VER > 1920
|
||||
#pragma warning(disable : 4709)
|
||||
#endif // _WIN32
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue