Commit 955307e5 authored by cutealien's avatar cutealien

Merge branch releases/1.8 revisions 5277:5284 into trunk:

- Add -U__STRICT_ANSI__ option to c::b project files to allow compiling with -std=c++11 and add an error when trying to compile with Irrlicht with __STRICT_ANSI__


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5285 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 2b18a9ae
...@@ -134,6 +134,7 @@ Changes in 1.9 (not yet released) ...@@ -134,6 +134,7 @@ Changes in 1.9 (not yet released)
-------------------------- --------------------------
Changes in 1.8.4 Changes in 1.8.4
- Add -U__STRICT_ANSI__ option to c::b project files to allow compiling with -std=c++11 and add an error when trying to compile with Irrlicht with __STRICT_ANSI__
- Update libpng to 1.6.21 - Update libpng to 1.6.21
- Update zlib to 1.2.8 - Update zlib to 1.2.8
- Fix some compile warnings in aes which got handled as errors by some c++11 compilers. - Fix some compile warnings in aes which got handled as errors by some c++11 compilers.
......
...@@ -25,6 +25,10 @@ ...@@ -25,6 +25,10 @@
#include "CWriteFile.h" #include "CWriteFile.h"
#include "irrList.h" #include "irrList.h"
#if defined (__STRICT_ANSI__)
#error Compiling with __STRICT_ANSI__ not supported. g++ does set this when compiling with -std=c++11 or -std=c++0x. Use instead -std=gnu++11 or -std=gnu++0x. Or use -U__STRICT_ANSI__ to disable strict ansi.
#endif
#if defined (_IRR_WINDOWS_API_) #if defined (_IRR_WINDOWS_API_)
#if !defined ( _WIN32_WCE ) #if !defined ( _WIN32_WCE )
#include <direct.h> // for _chdir #include <direct.h> // for _chdir
...@@ -1086,4 +1090,3 @@ IAttributes* CFileSystem::createEmptyAttributes(video::IVideoDriver* driver) ...@@ -1086,4 +1090,3 @@ IAttributes* CFileSystem::createEmptyAttributes(video::IVideoDriver* driver)
} // end namespace irr } // end namespace irr
} // end namespace io } // end namespace io
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_ #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
#if defined (__STRICT_ANSI__)
#error Compiling with __STRICT_ANSI__ not supported. g++ does set this when compiling with -std=c++11 or -std=c++0x. Use instead -std=gnu++11 or -std=gnu++0x. Or use -U__STRICT_ANSI__ to disable strict ansi.
#endif
#include "CIrrDeviceWin32.h" #include "CIrrDeviceWin32.h"
#include "IEventReceiver.h" #include "IEventReceiver.h"
#include "irrList.h" #include "irrList.h"
......
This diff is collapsed.
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