| 1 |
http://www.ogre3d.org/mantis/view.php?id=425
|
| 2 |
|
| 3 |
--- ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
|
| 4 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
|
| 5 |
@@ -31,6 +31,7 @@
|
| 6 |
#include <signal.h>
|
| 7 |
#include "OgrePrerequisites.h"
|
| 8 |
#include "OgreException.h"
|
| 9 |
+#include "Threading/OgreThreadHeaders.h"
|
| 10 |
|
| 11 |
namespace Ogre {
|
| 12 |
|
| 13 |
--- ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
|
| 14 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
|
| 15 |
@@ -42,6 +42,8 @@
|
| 16 |
# pragma GCC visibility pop
|
| 17 |
#endif
|
| 18 |
|
| 19 |
+#include "Threading/OgreThreadHeaders.h"
|
| 20 |
+
|
| 21 |
namespace Ogre {
|
| 22 |
/** \addtogroup Core
|
| 23 |
* @{
|
| 24 |
--- ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
|
| 25 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
|
| 26 |
@@ -31,6 +31,7 @@
|
| 27 |
|
| 28 |
#include "OgrePrerequisites.h"
|
| 29 |
#include "OgrePolygon.h"
|
| 30 |
+#include "Threading/OgreThreadHeaders.h"
|
| 31 |
|
| 32 |
|
| 33 |
namespace Ogre
|
| 34 |
@@ -58,9 +59,7 @@
|
| 35 |
|
| 36 |
// Static 'free list' of polygons to save reallocation, shared between all bodies
|
| 37 |
static PolygonList msFreePolygons;
|
| 38 |
-#if OGRE_THREAD_SUPPORT
|
| 39 |
OGRE_STATIC_MUTEX(msFreePolygonsMutex)
|
| 40 |
-#endif
|
| 41 |
|
| 42 |
public:
|
| 43 |
ConvexBody();
|
| 44 |
--- ogre_src_v1-7-4/OgreMain/include/OgreLog.h
|
| 45 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreLog.h
|
| 46 |
@@ -32,6 +32,8 @@
|
| 47 |
#include "OgrePrerequisites.h"
|
| 48 |
#include "OgreString.h"
|
| 49 |
|
| 50 |
+#include "Threading/OgreThreadHeaders.h"
|
| 51 |
+
|
| 52 |
namespace Ogre {
|
| 53 |
|
| 54 |
/** \addtogroup Core
|
| 55 |
--- ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
|
| 56 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
|
| 57 |
@@ -30,6 +30,8 @@
|
| 58 |
|
| 59 |
#include "OgrePrerequisites.h"
|
| 60 |
|
| 61 |
+#include "Threading/OgreThreadHeaders.h"
|
| 62 |
+
|
| 63 |
namespace Ogre {
|
| 64 |
/** \addtogroup Core
|
| 65 |
* @{
|
| 66 |
--- ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
|
| 67 |
+++ ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
|
| 68 |
@@ -44,9 +44,7 @@
|
| 69 |
// Statics
|
| 70 |
//-----------------------------------------------------------------------
|
| 71 |
ConvexBody::PolygonList ConvexBody::msFreePolygons;
|
| 72 |
-#if OGRE_THREAD_SUPPORT
|
| 73 |
OGRE_STATIC_MUTEX_INSTANCE(ConvexBody::msFreePolygonsMutex)
|
| 74 |
-#endif
|
| 75 |
//-----------------------------------------------------------------------
|
| 76 |
void ConvexBody::_initialisePool()
|
| 77 |
{
|