From 2eca491961771c45507927108f270a853f028ce2 Mon Sep 17 00:00:00 2001
From: LuisAntonRebollo <souga_el_diablo_negro@hotmail.com>
Date: Sun, 15 Feb 2015 12:33:00 +0100
Subject: [PATCH] Fix Bullet compilation.

---
 Engine/source/T3D/physics/bullet/bt.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Engine/source/T3D/physics/bullet/bt.h b/Engine/source/T3D/physics/bullet/bt.h
index b2c514ff5..394fdc7de 100644
--- a/Engine/source/T3D/physics/bullet/bt.h
+++ b/Engine/source/T3D/physics/bullet/bt.h
@@ -24,10 +24,14 @@
 #define _BULLET_H_
 
 // NOTE: We set these defines which bullet needs here.
-#ifdef TORQUE_OS_WIN
+#if defined TORQUE_OS_WIN && !defined(WIN32)
 #define WIN32
 #endif
 
+#ifdef TORQUE_CPU_X86
+#define __BT_SKIP_UINT64_H
+#endif
+
 // NOTE: All the Bullet includes we use should be here and
 // nowhere else.... beware!