Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2010-06-17 06:42:43 +0400
committerJoshua Leung <aligorith@gmail.com>2010-06-17 06:42:43 +0400
commited59822857de7e7b41b33b79c306f5e9b8755c62 (patch)
treeaa15011ba1df16a98d023acf2a276b265bd3ceda /extern/bullet2/BulletMultiThreaded/PlatformDefinitions.h
parent22bca493b23904c4dee7130f5737005f8558a26d (diff)
== SoC Bullet - Bullet Upgrade to 2.76 ==
Updated Blender's Bullet to 2.76 in this branch only. This update was done by: 1) deleting the contents of the existing extern/bullet2/src directory (leaving the .svn folder in place), 2) copy/pasting the contents of the bullet/src directory (from unzipped Bullet archive) into this newly cleared folder. Hopefully there aren't any patches that are still needed from the Bullet we had in source. --- Note: I didn't use Moguri's patch, since that was giving me compile errors with headers not being able to be found. [[Split portion of a mixed commit.]]
Diffstat (limited to 'extern/bullet2/BulletMultiThreaded/PlatformDefinitions.h')
-rw-r--r--extern/bullet2/BulletMultiThreaded/PlatformDefinitions.h84
1 files changed, 84 insertions, 0 deletions
diff --git a/extern/bullet2/BulletMultiThreaded/PlatformDefinitions.h b/extern/bullet2/BulletMultiThreaded/PlatformDefinitions.h
new file mode 100644
index 00000000000..16362f4bce3
--- /dev/null
+++ b/extern/bullet2/BulletMultiThreaded/PlatformDefinitions.h
@@ -0,0 +1,84 @@
+#ifndef TYPE_DEFINITIONS_H
+#define TYPE_DEFINITIONS_H
+
+///This file provides some platform/compiler checks for common definitions
+
+#ifdef _WIN32
+
+typedef union
+{
+ unsigned int u;
+ void *p;
+} addr64;
+
+#define USE_WIN32_THREADING 1
+
+ #if defined(__MINGW32__) || defined(__CYGWIN__) || (defined (_MSC_VER) && _MSC_VER < 1300)
+ #else
+ #endif //__MINGW32__
+
+ typedef unsigned char uint8_t;
+#ifndef __PHYSICS_COMMON_H__
+#ifndef __BT_SKIP_UINT64_H
+ typedef unsigned long int uint64_t;
+#endif //__BT_SKIP_UINT64_H
+ typedef unsigned int uint32_t;
+#endif //__PHYSICS_COMMON_H__
+ typedef unsigned short uint16_t;
+
+ #include <malloc.h>
+ #define memalign(alignment, size) malloc(size);
+
+#include <string.h> //memcpy
+
+
+
+ #include <stdio.h>
+ #define spu_printf printf
+
+#else
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h> //for memcpy
+
+#if defined (__CELLOS_LV2__)
+ // Playstation 3 Cell SDK
+#include <spu_printf.h>
+
+#else
+ // posix system
+
+#define USE_PTHREADS (1)
+
+#ifdef USE_LIBSPE2
+#include <stdio.h>
+#define spu_printf printf
+#define DWORD unsigned int
+
+ typedef union
+ {
+ unsigned long long ull;
+ unsigned int ui[2];
+ void *p;
+ } addr64;
+
+
+#else
+
+#include <stdio.h>
+#define spu_printf printf
+
+#endif // USE_LIBSPE2
+
+#endif //__CELLOS_LV2__
+
+#endif
+
+
+/* Included here because we need uint*_t typedefs */
+#include "PpuAddressSpace.h"
+
+#endif //TYPE_DEFINITIONS_H
+
+
+