Get rid of various old compiler and platform checks

diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h
index bd2c79ae40d92b9a08d1be194ff0e95bbec065a6..9d6ed66d09f09c595ce58cbbfa8aee680ee6d686 100644 (file)
--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@ -61,7 +61,7 @@
 //! WIN32 for Windows32\r
 //! WIN64 for Windows64\r
 // The windows platform and API support SDL and WINDOW device\r
-#if defined(_WIN32) || defined(_WIN64) || defined(WIN32) || defined(WIN64)\r
+#if defined(_WIN32) || defined(_WIN64)\r
 #define _IRR_WINDOWS_\r
 #define _IRR_WINDOWS_API_\r
 #ifndef _IRR_COMPILE_WITH_SDL_DEVICE_\r
@@ -69,14 +69,7 @@
 #endif\r
 #endif\r
 \r
-#if defined(_MSC_VER) && (_MSC_VER < 1500)\r
-#  error "Only Microsoft Visual Studio 9.0 and later are supported."\r
-#endif\r
-\r
-#if defined(__APPLE__) || defined(MACOSX)\r
-#if !defined(MACOSX)\r
-#define MACOSX // legacy support\r
-#endif\r
+#if defined(__APPLE__)\r
 #if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) || defined(__IPHONE_OS_VERSION_MIN_REQUIRED)\r
 #define _IRR_IOS_PLATFORM_\r
 #define _IRR_COMPILE_WITH_IOS_DEVICE_\r
@@ -181,10 +174,6 @@ If not defined, Windows Multimedia library is used, which offers also broad supp
 #ifdef NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_\r
 #undef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_\r
 #endif\r
-// can't get this to compile currently under borland, can be removed if someone has a better solution\r
-#if defined(__BORLANDC__)\r
-#undef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_\r
-#endif\r
 \r
 #endif\r
 \r
@@ -460,7 +449,7 @@ ones. */
 #else // _IRR_WINDOWS_API_\r
 \r
 // Force symbol export in shared libraries built with gcc.\r
-#if (__GNUC__ >= 4) && !defined(_IRR_STATIC_LIB_) && defined(IRRLICHT_EXPORTS)\r
+#if defined(__GNUC__) && !defined(_IRR_STATIC_LIB_) && defined(IRRLICHT_EXPORTS)\r
 #define IRRLICHT_API __attribute__ ((visibility("default")))\r
 #else\r
 #define IRRLICHT_API\r
@@ -480,22 +469,6 @@ ones. */
 #undef __IRR_HAS_S64\r
 #endif\r
 \r
-#if defined(__BORLANDC__)\r
-       #include <tchar.h>\r
-\r
-       // Borland 5.5.1\r
-       #if __BORLANDC__ == 0x551\r
-               #undef _tfinddata_t\r
-               #undef _tfindfirst\r
-               #undef _tfindnext\r
-\r
-               #define _tfinddata_t __tfinddata_t\r
-               #define _tfindfirst  __tfindfirst\r
-               #define _tfindnext   __tfindnext\r
-               typedef long intptr_t;\r
-       #endif\r
-#endif\r
-\r
 #ifndef __has_feature\r
   #define __has_feature(x) 0  // Compatibility with non-clang compilers.\r
 #endif\r

diff --git a/include/irrAllocator.h b/include/irrAllocator.h
index c7450ed79a6510c0d56c9dc73959ca98d424b385..ff6624b8a9e40139d0ee49439a715fed33dd5293 100644 (file)
--- a/include/irrAllocator.h
+++ b/include/irrAllocator.h
@@ -15,11 +15,6 @@ namespace irr
 namespace core\r
 {\r
 \r
-#ifdef DEBUG_CLIENTBLOCK\r
-#undef DEBUG_CLIENTBLOCK\r
-#define DEBUG_CLIENTBLOCK new\r
-#endif\r
-\r
 //! Very simple allocator implementation, containers using it can be used across dll boundaries\r
 template<typename T>\r
 class irrAllocator\r
@@ -102,12 +97,6 @@ public:
 };\r
 \r
 \r
-\r
-#ifdef DEBUG_CLIENTBLOCK\r
-#undef DEBUG_CLIENTBLOCK\r
-#define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__)\r
-#endif\r
-\r
 //! defines an allocation strategy (used only by irr::array so far)\r
 enum eAllocStrategy\r
 {\r

diff --git a/include/irrTypes.h b/include/irrTypes.h
index e3561cfb2f7279d1cd3de8abfcc1f2686e9897ea..f73e0a97f232496a6adee6187b6645ed999d2108 100644 (file)
--- a/include/irrTypes.h
+++ b/include/irrTypes.h
@@ -61,22 +61,17 @@ typedef double                              f64;
 \r
 \r
 #include <wchar.h>\r
-#ifdef _IRR_WINDOWS_API_\r
 //! Defines for s{w,n}printf_irr because s{w,n}printf methods do not match the ISO C\r
 //! standard on Windows platforms.\r
 //! We want int snprintf_irr(char *str, size_t size, const char *format, ...);\r
 //! and int swprintf_irr(wchar_t *wcs, size_t maxlen, const wchar_t *format, ...);\r
-#if defined(_MSC_VER) && _MSC_VER > 1310 && !defined (_WIN32_WCE)\r
+#if defined(_MSC_VER)\r
 #define swprintf_irr swprintf_s\r
 #define snprintf_irr sprintf_s\r
-#elif !defined(__CYGWIN__)\r
-#define swprintf_irr _snwprintf\r
-#define snprintf_irr _snprintf\r
-#endif\r
 #else\r
 #define swprintf_irr swprintf\r
 #define snprintf_irr snprintf\r
-#endif // _IRR_WINDOWS_API_\r
+#endif // _MSC_VER\r
 \r
 namespace irr\r
 {\r
@@ -89,15 +84,11 @@ namespace irr
 \r
 //! define a break macro for debugging.\r
 #if defined(_DEBUG)\r
-#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && !defined (_WIN32_WCE)\r
-#if defined(WIN64) || defined(_WIN64) // using portable common solution for x64 configuration\r
+#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER)\r
        #include <crtdbg.h>\r
        #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_CrtDbgBreak();}\r
 #else\r
-       #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_asm int 3}\r
-#endif\r
-#else\r
-       #include "assert.h"\r
+       #include <assert.h>\r
        #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) assert( !(_CONDITION_) );\r
 #endif\r
 #else\r
@@ -113,9 +104,9 @@ For functions:              template<class T> _IRR_DEPRECATED_ void test4(void) {}
 **/\r
 #if defined(IGNORE_DEPRECATED_WARNING)\r
 #define _IRR_DEPRECATED_\r
-#elif _MSC_VER >= 1310 //vs 2003 or higher\r
+#elif defined(_MSC_VER)\r
 #define _IRR_DEPRECATED_ __declspec(deprecated)\r
-#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) // all versions above 3.0 should support this feature\r
+#elif defined(__GNUC__)\r
 #define _IRR_DEPRECATED_  __attribute__ ((deprecated))\r
 #else\r
 #define _IRR_DEPRECATED_\r
@@ -125,35 +116,7 @@ For functions:             template<class T> _IRR_DEPRECATED_ void test4(void) {}
 /** Usage in a derived class:\r
 virtual void somefunc() _IRR_OVERRIDE_;\r
 */\r
-#if ( ((__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 7))) && (defined(__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L) )\r
-#define _IRR_OVERRIDE_ override\r
-#elif (_MSC_VER >= 1600 ) /* supported since MSVC 2010 */\r
 #define _IRR_OVERRIDE_ override\r
-#elif (__clang_major__ >= 3 && __has_feature(cxx_override_control))\r
-#define _IRR_OVERRIDE_ override\r
-#else\r
-#define _IRR_OVERRIDE_\r
-#endif\r
-\r
-// memory debugging\r
-#if defined(_DEBUG) && defined(IRRLICHT_EXPORTS) && defined(_MSC_VER) && \\r
-       (_MSC_VER > 1299) && !defined(_IRR_DONT_DO_MEMORY_DEBUGGING_HERE) && !defined(_WIN32_WCE)\r
-\r
-       #define CRTDBG_MAP_ALLOC\r
-       #define _CRTDBG_MAP_ALLOC\r
-       #define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__)\r
-       #include <stdlib.h>\r
-       #include <crtdbg.h>\r
-       #define new DEBUG_CLIENTBLOCK\r
-#endif\r
-\r
-//! ignore VC8 warning deprecated\r
-/** The Microsoft compiler */\r
-#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && (_MSC_VER >= 1400)\r
-       //#pragma warning( disable: 4996)\r
-       //#define _CRT_SECURE_NO_DEPRECATE 1\r
-       //#define _CRT_NONSTDC_NO_DEPRECATE 1\r
-#endif\r
 \r
 \r
 //! creates four CC codes used in Irrlicht for simple ids\r

diff --git a/include/irrpack.h b/include/irrpack.h
index ff922d06f9749fcff26db5cc8fb90b809d44b678..6ee1113fa8eefadf3de06c943c14e3b73e32f4b2 100644 (file)
--- a/include/irrpack.h
+++ b/include/irrpack.h
@@ -13,26 +13,13 @@
 // in between!\r
 \r
 // byte-align structures\r
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__)\r
+#if defined(_MSC_VER)\r
 #      pragma warning(disable: 4103)\r
 #      pragma pack( push, packing )\r
 #      pragma pack( 1 )\r
 #      define PACK_STRUCT\r
-#elif defined( __DMC__ )\r
-#      pragma pack( push, 1 )\r
-#      define PACK_STRUCT\r
 #elif defined( __GNUC__ )\r
-       // Using pragma pack might work with earlier gcc versions already, but\r
-       // it started to be necessary with gcc 4.7 on mingw unless compiled with -mno-ms-bitfields.\r
-       // And I found some hints on the web that older gcc versions on the other hand had sometimes\r
-       // trouble with pragma pack while they worked with __attribute__((packed)).\r
-#      if (__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 7))\r
-#              pragma pack( push, packing )\r
-#              pragma pack( 1 )\r
-#              define PACK_STRUCT\r
-#      else\r
-#              define PACK_STRUCT      __attribute__((packed))\r
-       #endif\r
+#      define PACK_STRUCT      __attribute__((packed))\r
 #else\r
 #      error compiler not supported\r
 #endif\r

diff --git a/include/irrunpack.h b/include/irrunpack.h
index ba478278063c246a1de9d2151810ea3ca3e3c14a..0863d7e2d83900f4f3fca53f58ce74ba68d3e5c1 100644 (file)
--- a/include/irrunpack.h
+++ b/include/irrunpack.h
@@ -6,14 +6,8 @@
 // file belongs to irrpack.h, see there for more info\r
 \r
 // Default alignment\r
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__)\r
+#if defined(_MSC_VER)\r
 #      pragma pack( pop, packing )\r
-#elif defined (__DMC__)\r
-#      pragma pack( pop )\r
-#elif defined( __GNUC__ )\r
-#   if (__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 7))\r
-#          pragma pack( pop, packing )\r
-#   endif\r
 #endif\r
 \r
 #undef PACK_STRUCT\r

diff --git a/source/Irrlicht/CEGLManager.h b/source/Irrlicht/CEGLManager.h
index 58d7f2991f0f2e45183dd37d0e42754565cfeb88..06954f02f9b78c2f8842575e3110345d4bce59a2 100755 (executable)
--- a/source/Irrlicht/CEGLManager.h
+++ b/source/Irrlicht/CEGLManager.h
@@ -15,10 +15,6 @@
 #include "SExposedVideoData.h"\r
 #include "IContextManager.h"\r
 \r
-#ifdef _MSC_VER\r
-#pragma comment(lib, "libEGL.lib")\r
-#endif\r
-\r
 namespace irr\r
 {\r
 namespace video\r

diff --git a/source/Irrlicht/CFileSystem.cpp b/source/Irrlicht/CFileSystem.cpp
index 78603b89d8e38dc9bd4104de772d857c69540003..e1d02484e5fb436d843b800f52c138ebcb19dc13 100644 (file)
--- a/source/Irrlicht/CFileSystem.cpp
+++ b/source/Irrlicht/CFileSystem.cpp
@@ -23,11 +23,9 @@
 #endif\r
 \r
 #if defined (_IRR_WINDOWS_API_)\r
-       #if !defined ( _WIN32_WCE )\r
-               #include <direct.h> // for _chdir\r
-               #include <io.h> // for _access\r
-               #include <tchar.h>\r
-       #endif\r
+       #include <direct.h> // for _chdir\r
+       #include <io.h> // for _access\r
+       #include <tchar.h>\r
 #elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_) || defined(_IRR_IOS_PLATFORM_) || defined(_IRR_ANDROID_PLATFORM_))\r
                #include <stdio.h>\r
                #include <stdlib.h>\r
@@ -797,7 +795,6 @@ IFileList* CFileSystem::createFileList()
                // --------------------------------------------\r
                //! Windows version\r
                #ifdef _IRR_WINDOWS_API_\r
-               #if !defined ( _WIN32_WCE )\r
 \r
                r = new CFileList(Path, true, false);\r
 \r
@@ -819,12 +816,7 @@ IFileList* CFileSystem::createFileList()
 \r
                        _findclose( hFile );\r
                }\r
-               #endif\r
 \r
-               //TODO add drives\r
-               //entry.Name = "E:\\";\r
-               //entry.isDirectory = true;\r
-               //Files.push_back(entry);\r
                #endif\r
 \r
                // --------------------------------------------\r

diff --git a/source/Irrlicht/CIrrDeviceConsole.h b/source/Irrlicht/CIrrDeviceConsole.h
index c4436a595a91f18a6603e8fba40fa9e8c2294ded..8967129ac65c8672f08da74ab39387ca797eddd3 100644 (file)
--- a/source/Irrlicht/CIrrDeviceConsole.h
+++ b/source/Irrlicht/CIrrDeviceConsole.h
@@ -18,9 +18,7 @@
 \r
 #ifdef _IRR_WINDOWS_API_\r
 #define WIN32_LEAN_AND_MEAN\r
-#if !defined(_IRR_XBOX_PLATFORM_)\r
-       #include <windows.h>\r
-#endif\r
+#include <windows.h>\r
 #define _IRR_WINDOWS_NT_CONSOLE_\r
 #else\r
 #include <time.h>\r

diff --git a/source/Irrlicht/CIrrDeviceWin32.cpp b/source/Irrlicht/CIrrDeviceWin32.cpp
index 4fedde2151d2e759f3882f137594c298aef528ed..0bb8c1f766af534c6f0b8fac97cf40220082e85f 100644 (file)
--- a/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -22,20 +22,13 @@
 #include "IGUISpriteBank.h"\r
 #include <winuser.h>\r
 #include "SExposedVideoData.h"\r
+\r
 #if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)\r
 #include <mmsystem.h>\r
 #include <regstr.h>\r
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_\r
 #define DIRECTINPUT_VERSION 0x0800\r
 #include <dinput.h>\r
-#ifdef _MSC_VER\r
-#pragma comment(lib, "dinput8.lib")\r
-#pragma comment(lib, "dxguid.lib")\r
-#endif\r
-#else\r
-#ifdef _MSC_VER\r
-#pragma comment(lib, "winmm.lib")\r
-#endif\r
 #endif\r
 #endif\r
 \r

diff --git a/source/Irrlicht/CIrrDeviceWin32.h b/source/Irrlicht/CIrrDeviceWin32.h
index 6f472262139c0fc2f90d384aa1c2a7279cb37856..02c42b7e8cf6f0a8eea36833655426f8803aa876 100644 (file)
--- a/source/Irrlicht/CIrrDeviceWin32.h
+++ b/source/Irrlicht/CIrrDeviceWin32.h
@@ -13,11 +13,9 @@
 #include "IImagePresenter.h"\r
 \r
 #define WIN32_LEAN_AND_MEAN\r
-#if !defined(_IRR_XBOX_PLATFORM_)\r
-       #include <windows.h>\r
-       #include <mmsystem.h> // For JOYCAPS\r
-       #include <windowsx.h>\r
-#endif\r
+#include <windows.h>\r
+#include <mmsystem.h> // For JOYCAPS\r
+#include <windowsx.h>\r
 #if !defined(GET_X_LPARAM)\r
 #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))\r
 #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))\r

diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h
index 90a80554941edb3bedcf4fbbe999cb2640d1ce22..e95931f4da327c98516d61acd8430c28fe6e3e2b 100644 (file)
--- a/source/Irrlicht/CNullDriver.h
+++ b/source/Irrlicht/CNullDriver.h
@@ -22,10 +22,6 @@
 #include "SLight.h"\r
 #include "SExposedVideoData.h"\r
 \r
-#ifdef _MSC_VER\r
-#pragma warning( disable: 4996)\r
-#endif\r
-\r
 namespace irr\r
 {\r
 namespace io\r

diff --git a/source/Irrlicht/COGLES2Driver.h b/source/Irrlicht/COGLES2Driver.h
index d51f11ec3d49791ae4c9cfa4e90dbaee38824e64..b0d734a26ec24a317d2f2d83b00eff6237583e28 100644 (file)
--- a/source/Irrlicht/COGLES2Driver.h
+++ b/source/Irrlicht/COGLES2Driver.h
@@ -27,10 +27,6 @@
 #include <windows.h>\r
 #endif\r
 \r
-#ifdef _MSC_VER\r
-#pragma comment(lib, "libGLESv2.lib")\r
-#endif\r
-\r
 namespace irr\r
 {\r
 namespace video\r

diff --git a/source/Irrlicht/COGLESDriver.h b/source/Irrlicht/COGLESDriver.h
index 92dcd225fd85b9574c7bd903af8a0e967ae759c8..85e51566cf70c6fc818ab3078b622d9c1311120b 100644 (file)
--- a/source/Irrlicht/COGLESDriver.h
+++ b/source/Irrlicht/COGLESDriver.h
@@ -26,10 +26,6 @@
 #include <windows.h>\r
 #endif\r
 \r
-#ifdef _MSC_VER\r
-#pragma comment(lib, "libGLES_CM.lib")\r
-#endif\r
-\r
 namespace irr\r
 {\r
 namespace video\r

diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
index 7824e677f1395489204fc89b278222b4f7692682..a6f9461d8a253a4eede0d8b0b481620599da5786 100644 (file)
--- a/source/Irrlicht/COSOperator.cpp
+++ b/source/Irrlicht/COSOperator.cpp
@@ -5,9 +5,7 @@
 #include "COSOperator.h"\r
 \r
 #ifdef _IRR_WINDOWS_API_\r
-#ifndef _IRR_XBOX_PLATFORM_\r
 #include <windows.h>\r
-#endif\r
 #else\r
 #include <string.h>\r
 #include <unistd.h>\r
@@ -63,8 +61,7 @@ void COSOperator::copyToClipboard(const c8 *text) const
                return;\r
 \r
 // Windows version\r
-#if defined(_IRR_XBOX_PLATFORM_)\r
-#elif defined(_IRR_WINDOWS_API_)\r
+#if defined(_IRR_WINDOWS_API_)\r
        if (!OpenClipboard(NULL) || text == 0)\r
                return;\r
 \r
@@ -101,8 +98,6 @@ void COSOperator::copyToClipboard(const c8 *text) const
 #elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)\r
     if ( IrrDeviceLinux )\r
         IrrDeviceLinux->copyToClipboard(text);\r
-#else\r
-\r
 #endif\r
 }\r
 \r
@@ -111,9 +106,7 @@ void COSOperator::copyToClipboard(const c8 *text) const
 //! \return Returns 0 if no string is in there, otherwise an utf-8 string.\r
 const c8* COSOperator::getTextFromClipboard() const\r
 {\r
-#if defined(_IRR_XBOX_PLATFORM_)\r
-               return 0;\r
-#elif defined(_IRR_WINDOWS_API_)\r
+#if defined(_IRR_WINDOWS_API_)\r
        if (!OpenClipboard(NULL))\r
                return 0;\r
 \r
@@ -156,7 +149,7 @@ const c8* COSOperator::getTextFromClipboard() const
 \r
 bool COSOperator::getSystemMemory(u32* Total, u32* Avail) const\r
 {\r
-#if defined(_IRR_WINDOWS_API_) && !defined (_IRR_XBOX_PLATFORM_)\r
+#if defined(_IRR_WINDOWS_API_)\r
 \r
        MEMORYSTATUSEX MemoryStatusEx;\r
        MemoryStatusEx.dwLength = sizeof(MEMORYSTATUSEX);\r

diff --git a/source/Irrlicht/COpenGLCommon.h b/source/Irrlicht/COpenGLCommon.h
index 22a24b6da69397818f4b5e2707b20129b1602be4..6f7b790fbdd11d01518e53684903fa03484774cf 100644 (file)
--- a/source/Irrlicht/COpenGLCommon.h
+++ b/source/Irrlicht/COpenGLCommon.h
@@ -20,11 +20,6 @@
                #include <GL/glext.h>\r
        #endif\r
        #include <GL/wglext.h>\r
-\r
-       #ifdef _MSC_VER\r
-               #pragma comment(lib, "OpenGL32.lib")\r
-       #endif\r
-\r
 #elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)\r
        #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
                #define GL_GLEXT_LEGACY 1\r

diff --git a/source/Irrlicht/CWGLManager.cpp b/source/Irrlicht/CWGLManager.cpp
index 3d6e4f803715ad40bf9eccbb6656951f3cd1d9ea..182c460ceb08b73e89215bda0e1c23aa87e5a305 100644 (file)
--- a/source/Irrlicht/CWGLManager.cpp
+++ b/source/Irrlicht/CWGLManager.cpp
@@ -11,10 +11,6 @@
 #include <GL/gl.h>\r
 #include <GL/wglext.h>\r
 \r
-#ifdef _MSC_VER\r
-       #pragma comment(lib, "OpenGL32.lib")\r
-#endif\r
-\r
 namespace irr\r
 {\r
 namespace video\r

diff --git a/source/Irrlicht/Irrlicht.cpp b/source/Irrlicht/Irrlicht.cpp
index 1e0165105f6f6bd3f58da5a595d1f9db355015fb..6b77ceb93ca3e033f437853ab734180baa047d60 100644 (file)
--- a/source/Irrlicht/Irrlicht.cpp
+++ b/source/Irrlicht/Irrlicht.cpp
@@ -8,7 +8,7 @@ static const char* const copyright = "Irrlicht Engine (c) 2002-2017 Nikolaus Geb
 \r
 #ifdef _IRR_WINDOWS_\r
        #include <windows.h>\r
-       #if defined(_DEBUG) && !defined(__GNUWIN32__) && !defined(_WIN32_WCE)\r
+       #if defined(_DEBUG) && !defined(__GNUWIN32__)\r
                #include <crtdbg.h>\r
        #endif // _DEBUG\r
 #endif\r
@@ -148,7 +148,7 @@ BOOL APIENTRY DllMain( HANDLE hModule,
     switch (ul_reason_for_call)\r
        {\r
                case DLL_PROCESS_ATTACH:\r
-                       #if defined(_DEBUG) && !defined(__GNUWIN32__) && !defined(__BORLANDC__) && !defined (_WIN32_WCE) && !defined (_IRR_XBOX_PLATFORM_)\r
+                       #if defined(_DEBUG) && !defined(__GNUWIN32__)\r
                                _CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF | _CRTDBG_ALLOC_MEM_DF);\r
                        #endif\r
                        break;\r

diff --git a/source/Irrlicht/SoftwareDriver2_compile_config.h b/source/Irrlicht/SoftwareDriver2_compile_config.h
deleted file mode 100644 (file)
index 8f46869..0000000
--- a/source/Irrlicht/SoftwareDriver2_compile_config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt / Thomas Alten\r
-// This file is part of the "Irrlicht Engine".\r
-// For conditions of distribution and use, see copyright notice in irrlicht.h\r
-\r
-#ifndef __S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED__\r
-#define __S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED__\r
-\r
-#include "IrrCompileConfig.h"\r
-\r
-#ifndef REALINLINE\r
-#ifdef _MSC_VER\r
-#define REALINLINE __forceinline\r
-#else\r
-#define REALINLINE inline\r
-#endif\r
-#endif\r
-\r
-//! Size of a static C-style array.\r
-#define array_size(_arr)  ((sizeof(_arr)/sizeof(*_arr)))\r
-\r
-//! Compiler Align\r
-#if defined(_MSC_VER)\r
-#define ALIGN(x) __declspec(align(x))\r
-#elif defined(__GNUC__)\r
-#define ALIGN(x) __attribute__ ((aligned(x)))\r
-#else\r
-#define ALIGN(x)\r
-#endif\r
-\r
-#endif // __S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED__\r

diff --git a/source/Irrlicht/SoftwareDriver2_helper.h b/source/Irrlicht/SoftwareDriver2_helper.h
index 2f8b00b0f2c2dee95129870f85c7aafb5f3c289d..a864a57f0fc9d69f2230f99c6ae39ca910ecd7f4 100644 (file)
--- a/source/Irrlicht/SoftwareDriver2_helper.h
+++ b/source/Irrlicht/SoftwareDriver2_helper.h
@@ -10,10 +10,17 @@
 #ifndef __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__\r
 #define __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__\r
 \r
-#include "SoftwareDriver2_compile_config.h"\r
 #include "irrMath.h"\r
 #include "SMaterial.h"\r
 \r
+#ifndef REALINLINE\r
+#ifdef _MSC_VER\r
+#define REALINLINE __forceinline\r
+#else\r
+#define REALINLINE inline\r
+#endif\r
+#endif\r
+\r
 \r
 namespace irr\r
 {\r

diff --git a/source/Irrlicht/os.cpp b/source/Irrlicht/os.cpp
index b27d56bf7d8b60661d0cc75c36a83880b02f6e65..47031c988e5fa3c3ca10ec506ee49c9031da3c3b 100644 (file)
--- a/source/Irrlicht/os.cpp
+++ b/source/Irrlicht/os.cpp
@@ -12,14 +12,12 @@
        #define bswap_16(X) SDL_Swap16(X)\r
        #define bswap_32(X) SDL_Swap32(X)\r
        #define bswap_64(X) SDL_Swap64(X)\r
-#elif defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && (_MSC_VER > 1298)\r
+#elif defined(_IRR_WINDOWS_API_) && defined(_MSC_VER)\r
        #include <stdlib.h>\r
        #define bswap_16(X) _byteswap_ushort(X)\r
        #define bswap_32(X) _byteswap_ulong(X)\r
        #define bswap_64(X) _byteswap_uint64(X)\r
-#if (_MSC_VER >= 1400)\r
        #define localtime _localtime_s\r
-#endif\r
 #elif defined(_IRR_OSX_PLATFORM_) || defined(_IRR_IOS_PLATFORM_)\r
        #include <libkern/OSByteOrder.h>\r
        #define bswap_16(X) OSReadSwapInt16(&X,0)\r
@@ -65,13 +63,9 @@ namespace os
 // Windows specific functions\r
 // ----------------------------------------------------------------\r
 \r
-#ifdef _IRR_XBOX_PLATFORM_\r
-#include <xtl.h>\r
-#else\r
 #define WIN32_LEAN_AND_MEAN\r
 #include <windows.h>\r
 #include <time.h>\r
-#endif\r
 \r
 namespace irr\r
 {\r
@@ -80,16 +74,10 @@ namespace os
        //! prints a debuginfo string\r
        void Printer::print(const c8* message, ELOG_LEVEL ll)\r
        {\r
-#if defined (_WIN32_WCE )\r
-               core::stringw tmp(message);\r
-               tmp += L"\n";\r
-               OutputDebugStringW(tmp.c_str());\r
-#else\r
                core::stringc tmp(message);\r
                tmp += "\n";\r
                OutputDebugStringA(tmp.c_str());\r
                printf("%s", tmp.c_str());\r
-#endif\r
        }\r
 \r
        static LARGE_INTEGER HighPerformanceFreq;\r