mirror of
https://github.com/bulletphysics/bullet3.git
synced 2026-09-26 12:06:09 +00:00
fix some compatibility issues between Bullet / PE / vectormath, introduced a few commits ago
This commit is contained in:
@@ -5,7 +5,11 @@
|
||||
#include "LinearMath/btScalar.h"
|
||||
#include "LinearMath/btMinMax.h"
|
||||
|
||||
#ifdef PFX_USE_FREE_VECTORMATH
|
||||
#include "vecmath/vmInclude.h"
|
||||
#else
|
||||
#include "vectormath/vmInclude.h"
|
||||
#endif//PFX_USE_FREE_VECTORMATH
|
||||
|
||||
|
||||
|
||||
@@ -27,9 +31,11 @@ typedef union
|
||||
|
||||
typedef unsigned char uint8_t;
|
||||
#ifndef __PHYSICS_COMMON_H__
|
||||
#ifndef PFX_USE_FREE_VECTORMATH
|
||||
#ifndef __BT_SKIP_UINT64_H
|
||||
typedef unsigned long int uint64_t;
|
||||
#endif //__BT_SKIP_UINT64_H
|
||||
#endif //PFX_USE_FREE_VECTORMATH
|
||||
typedef unsigned int uint32_t;
|
||||
#endif //__PHYSICS_COMMON_H__
|
||||
typedef unsigned short uint16_t;
|
||||
|
||||
Reference in New Issue
Block a user