Browse Source

Fix non-MSVC build.

Lasse Öörni 10 years ago
parent
commit
08293b4cf4
29 changed files with 31 additions and 29 deletions
  1. 1 1
      Source/ThirdParty/Assimp/code/Bitmap.h
  2. 1 1
      Source/ThirdParty/Assimp/code/BlenderDNA.h
  3. 1 1
      Source/ThirdParty/Assimp/code/BlobIOSystem.h
  4. 1 1
      Source/ThirdParty/Assimp/code/ByteSwapper.h
  5. 1 1
      Source/ThirdParty/Assimp/code/ColladaHelper.h
  6. 1 1
      Source/ThirdParty/Assimp/code/FBXBinaryTokenizer.cpp
  7. 1 1
      Source/ThirdParty/Assimp/code/FBXDocument.h
  8. 1 1
      Source/ThirdParty/Assimp/code/FBXParser.h
  9. 1 1
      Source/ThirdParty/Assimp/code/HMPFileData.h
  10. 1 1
      Source/ThirdParty/Assimp/code/Hash.h
  11. 1 1
      Source/ThirdParty/Assimp/code/IRRShared.h
  12. 1 1
      Source/ThirdParty/Assimp/code/MD2FileData.h
  13. 1 1
      Source/ThirdParty/Assimp/code/MD3FileData.h
  14. 1 1
      Source/ThirdParty/Assimp/code/MD5Parser.h
  15. 1 1
      Source/ThirdParty/Assimp/code/MDCFileData.h
  16. 1 1
      Source/ThirdParty/Assimp/code/MDLFileData.h
  17. 1 1
      Source/ThirdParty/Assimp/code/MaterialSystem.h
  18. 1 1
      Source/ThirdParty/Assimp/code/MemoryIOWrapper.h
  19. 1 1
      Source/ThirdParty/Assimp/code/NDOLoader.h
  20. 1 1
      Source/ThirdParty/Assimp/code/OgreParsingUtils.h
  21. 1 1
      Source/ThirdParty/Assimp/code/Q3DLoader.h
  22. 1 1
      Source/ThirdParty/Assimp/code/SGSpatialSort.h
  23. 1 1
      Source/ThirdParty/Assimp/code/SceneCombiner.h
  24. 1 1
      Source/ThirdParty/Assimp/code/SmoothingGroups.h
  25. 1 1
      Source/ThirdParty/Assimp/code/StringComparison.h
  26. 1 1
      Source/ThirdParty/Assimp/code/UnrealLoader.h
  27. 1 1
      Source/ThirdParty/Assimp/code/XFileHelper.h
  28. 3 1
      Source/ThirdParty/Assimp/code/fast_atof.h
  29. 1 1
      Source/ThirdParty/Assimp/code/qnan.h

+ 1 - 1
Source/ThirdParty/Assimp/code/Bitmap.h

@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_BITMAP_H_INC
 
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/BlenderDNA.h

@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "StreamReader.h"
 #include "../include/assimp/DefaultLogger.hpp"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/BlobIOSystem.h

@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "./../include/assimp/DefaultLogger.hpp"
 #include <boost/foreach.hpp>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/ByteSwapper.h

@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/ai_assert.h"
 #include "../include/assimp/types.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/ColladaHelper.h

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 #include <vector>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/FBXBinaryTokenizer.cpp

@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXUtil.h"
 #include "../include/assimp/defs.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/FBXDocument.h

@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 #include <string>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/FBXParser.h

@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <utility>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/HMPFileData.h

@@ -49,7 +49,7 @@ namespace HMP   {
 
 #include "./../include/assimp/Compiler/pushpack1.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/Hash.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_HASH_H_INCLUDED
 
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/IRRShared.h

@@ -11,7 +11,7 @@
 #include "irrXMLWrapper.h"
 #include "BaseImporter.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/MD2FileData.h

@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/mesh.h"
 #include "../include/assimp/anim.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/MD3FileData.h

@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <sstream>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/MD5Parser.h

@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ParsingUtils.h"
 #include <vector>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/MDCFileData.h

@@ -57,7 +57,7 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
 
 #include "./../include/assimp/Compiler/pushpack1.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/MDLFileData.h

@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "./../include/assimp/mesh.h"
 #include "./../include/assimp/Compiler/pushpack1.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/MaterialSystem.h

@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_MATERIALSYSTEM_H_INC
 
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/MemoryIOWrapper.h

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/IOSystem.hpp"
 #include "../include/assimp/ai_assert.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/NDOLoader.h

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/vector3.h"
 #include "BaseImporter.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/OgreParsingUtils.h

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <functional>
 #include <algorithm>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/Q3DLoader.h

@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/types.h"
 #include <vector>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/SGSpatialSort.h

@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/types.h"
 #include <vector>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/SceneCombiner.h

@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <set>
 #include <list>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/SmoothingGroups.h

@@ -48,7 +48,7 @@ http://www.jalix.org/ressources/graphics/3DS/_unofficials/3ds-unofficial.txt */
 
 #include "../include/assimp/vector3.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/StringComparison.h

@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <string.h>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/UnrealLoader.h

@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseImporter.h"
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/XFileHelper.h

@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 3 - 1
Source/ThirdParty/Assimp/code/fast_atof.h

@@ -18,8 +18,10 @@
 
 #include <cmath>
 #include <limits>
+// Urho3D: added include
+#include <limits.h>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"

+ 1 - 1
Source/ThirdParty/Assimp/code/qnan.h

@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/defs.h"
 #include <limits>
 // Urho3D: VS2008 compatibility
-#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
 #include <stdint.h>
 #else
 #include "../include/assimp/Compiler/pstdint.h"