1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00

Irrlicht support code maintenance

This commit is contained in:
sfan5 2021-03-31 13:15:47 +02:00 committed by GitHub
parent 0d90ed6d92
commit 1e4913cd76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 5 additions and 79 deletions

View file

@ -19,16 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once
/* Ensure that <stdint.h> is included before <irrTypes.h>, unless building on
* MSVC, to address an irrlicht issue: https://sourceforge.net/p/irrlicht/bugs/433/
*
* TODO: Decide whether or not we support non-compliant C++ compilers like old
* versions of MSCV. If we do not then <stdint.h> can always be included
* regardless of the compiler.
/*
* IrrlichtMt already includes stdint.h in irrTypes.h. This works everywhere
* we need it to (including recent MSVC), so should be fine here too.
*/
#ifndef _MSC_VER
# include <cstdint>
#endif
#include <cstdint>
#include <irrTypes.h>
@ -36,19 +31,6 @@ using namespace irr;
namespace irr {
// Irrlicht 1.8+ defines 64bit unsigned symbol in irrTypes.h
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
#ifdef _MSC_VER
// Windows
typedef long long s64;
typedef unsigned long long u64;
#else
// Posix
typedef int64_t s64;
typedef uint64_t u64;
#endif
#endif
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 9)
namespace core {
template <typename T>