Commit ab00c9db authored by cutealien's avatar cutealien

Update minimal compiler support to Microsoft Visual Studio 9.0 and remove some...

Update minimal compiler support to Microsoft Visual Studio 9.0 and remove some workarounds for earlier versions.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5051 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 0cbb9112
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
#define _IRR_COMPILE_WITH_WINDOWS_DEVICE_ #define _IRR_COMPILE_WITH_WINDOWS_DEVICE_
#endif #endif
#if defined(_MSC_VER) && (_MSC_VER < 1300) #if defined(_MSC_VER) && (_MSC_VER < 1500)
# error "Only Microsoft Visual Studio 7.0 and later are supported." # error "Only Microsoft Visual Studio 9.0 and later are supported."
#endif #endif
// XBox only suppots the native Window stuff // XBox only suppots the native Window stuff
...@@ -729,17 +729,6 @@ precision will be lower but speed higher. currently X86 only ...@@ -729,17 +729,6 @@ precision will be lower but speed higher. currently X86 only
#endif // _IRR_WINDOWS_API_ #endif // _IRR_WINDOWS_API_
// We need to disable DIRECT3D9 support for Visual Studio 6.0 because
// those $%&$!! disabled support for it since Dec. 2004 and users are complaining
// about linker errors. Comment this out only if you are knowing what you are
// doing. (Which means you have an old DX9 SDK and VisualStudio6).
#ifdef _MSC_VER
#if (_MSC_VER < 1300 && !defined(__GNUC__))
#undef _IRR_COMPILE_WITH_DIRECT3D_9_
#pragma message("Compiling Irrlicht with Visual Studio 6.0, support for DX9 is disabled.")
#endif
#endif
// XBox does not have OpenGL or DirectX9 // XBox does not have OpenGL or DirectX9
#if defined(_IRR_XBOX_PLATFORM_) #if defined(_IRR_XBOX_PLATFORM_)
#undef _IRR_COMPILE_WITH_OPENGL_ #undef _IRR_COMPILE_WITH_OPENGL_
......
...@@ -67,10 +67,6 @@ public: ...@@ -67,10 +67,6 @@ public:
bool operator ==(const ConstIterator& other) const { return Current == other.Current; } bool operator ==(const ConstIterator& other) const { return Current == other.Current; }
bool operator !=(const ConstIterator& other) const { return Current != other.Current; } bool operator !=(const ConstIterator& other) const { return Current != other.Current; }
#if defined (_MSC_VER) && (_MSC_VER < 1300)
#pragma warning(disable:4284) // infix notation problem when using iterator operator ->
#endif
T & operator * () { return Current->Element; } T & operator * () { return Current->Element; }
T * operator ->() { return &Current->Element; } T * operator ->() { return &Current->Element; }
......
...@@ -221,12 +221,6 @@ virtual void somefunc() _IRR_OVERRIDE_; ...@@ -221,12 +221,6 @@ virtual void somefunc() _IRR_OVERRIDE_;
#define new DEBUG_CLIENTBLOCK #define new DEBUG_CLIENTBLOCK
#endif #endif
// disable truncated debug information warning in visual studio 6 by default
#if defined(_MSC_VER) && (_MSC_VER < 1300 )
#pragma warning( disable: 4786)
#endif // _MSC
//! ignore VC8 warning deprecated //! ignore VC8 warning deprecated
/** The microsoft compiler */ /** The microsoft compiler */
#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && (_MSC_VER >= 1400) #if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && (_MSC_VER >= 1400)
......
...@@ -24,9 +24,7 @@ ...@@ -24,9 +24,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment