Permalink
Browse files

Minor changes for IrrLicht 1.9 support

  • Loading branch information...
numberZero authored and sfan5 committed Nov 5, 2018
1 parent 4f9c33d commit b78698240c4b0e4ac410e2aafe6d88b34b1618e2
Showing with 15 additions and 4 deletions.
  1. +0 −4 src/gui/intlGUIEditBox.cpp
  2. +15 −0 src/irrlichttypes.h
@@ -32,8 +32,6 @@
#include <util/numeric.h>
#include "intlGUIEditBox.h"

#if defined(_IRR_COMPILE_WITH_GUI_) && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9 || defined(__ANDROID__)

#include "IGUISkin.h"
#include "IGUIEnvironment.h"
#include "IGUIFont.h"
@@ -1591,5 +1589,3 @@ void intlGUIEditBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRe

} // end namespace gui
} // end namespace irr

#endif // _IRR_COMPILE_WITH_GUI_
@@ -31,9 +31,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#endif

#include <irrTypes.h>
#include <irrMath.h>

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
@@ -47,6 +50,18 @@ using namespace irr;
#endif
#endif

#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 9)
namespace core {
template <>
inline s16 roundingError()
{
return 0;
}
}
#endif

}

#define S8_MIN (-0x7F - 1)
#define S16_MIN (-0x7FFF - 1)
#define S32_MIN (-0x7FFFFFFF - 1)

0 comments on commit b786982

Please sign in to comment.