Android compile fixes.

This commit is contained in:
David Williams 2012-12-29 23:47:32 +01:00
parent 7e8af71e52
commit 8e5a09d0fc
2 changed files with 2 additions and 2 deletions

View File

@ -15,7 +15,7 @@
// is a recent version) then assume support for these. // is a recent version) then assume support for these.
#if !defined(_MSC_VER) || (_MSC_VER >= 1600) #if !defined(_MSC_VER) || (_MSC_VER >= 1600)
#define HAS_CXX11_CONSTEXPR #define HAS_CXX11_CONSTEXPR
#define HAS_CXX11_STATIC_ASSERT //#define HAS_CXX11_STATIC_ASSERT //This seems to cause issues on Android.
#define HAS_CXX11_CSTDINT_H #define HAS_CXX11_CSTDINT_H
#define HAS_CXX11_SHARED_PTR #define HAS_CXX11_SHARED_PTR
#endif #endif

View File

@ -25,6 +25,6 @@ freely, subject to the following restrictions:
#define __PolyVox_Config_H__ #define __PolyVox_Config_H__
#define POLYVOX_ASSERTS_ENABLED #define POLYVOX_ASSERTS_ENABLED
#define POLYVOX_THROW_ENABLED //#define POLYVOX_THROW_ENABLED //Not allowed on Android.
#endif #endif