Workaround to allow main loop to know Ogre::Root's mQueuedEnd value

This change is needed because of changes in exit handling

libs/openengine/ogre/renderer.cpp

@@ -24,6 +24,21 @@
 using namespace Ogre;
 using namespace OEngine::Render;
 
+#if defined(__APPLE__) && !defined(__LP64__)
+
+CustomRoot::CustomRoot(const Ogre::String& pluginFileName, 
+                    const Ogre::String& configFileName, 
+                    const Ogre::String& logFileName)
+: Ogre::Root(pluginFileName, configFileName, logFileName)
+{}
+
+bool CustomRoot::isQueuedEnd() const
+{
+    return mQueuedEnd;
+}
+
+#endif
+
 void OgreRenderer::cleanup()
 {
     delete mFader;
@@ -36,7 +51,6 @@ void OgreRenderer::cleanup()
 void OgreRenderer::start()
 {
 #if defined(__APPLE__) && !defined(__LP64__)
-    bool quit = false;
     // OSX Carbon Message Pump
     do {
         EventRef event = NULL;
@@ -54,11 +68,11 @@ void OgreRenderer::start()
             ReleaseEvent(event);
         }
 
-        if (!Ogre::Root::getSingleton().renderOneFrame()) {
-            quit = true;
+        if (!mRoot->renderOneFrame()) {
+            break;
         }
 
-    } while (!quit);
+    } while (!mRoot->isQueuedEnd());
 #else
     mRoot->startRendering();
 #endif
@@ -120,7 +134,11 @@ void OgreRenderer::configure(const std::string &logPath,
         // Disable logging
         log->setDebugOutputEnabled(false);
 
+#if defined(__APPLE__) && !defined(__LP64__)
+    mRoot = new CustomRoot("", "", "");
+#else
     mRoot = new Root("", "", "");
+#endif
 
     #if defined(ENABLE_PLUGIN_GL) || defined(ENABLE_PLUGIN_Direct3D9) || defined(ENABLE_PLUGIN_CgProgramManager) || defined(ENABLE_PLUGIN_OctreeSceneManager) || defined(ENABLE_PLUGIN_ParticleFX)
     loadPlugins();

libs/openengine/ogre/renderer.hpp

@@ -27,9 +27,15 @@
 #include "OgreTexture.h"
 #include <OgreWindowEventUtilities.h>
 
+#if defined(__APPLE__) && !defined(__LP64__)  
+#include <OgreRoot.h>
+#endif
+
 namespace Ogre
 {
+#if !defined(__APPLE__) || defined(__LP64__)
     class Root;
+#endif
     class RenderWindow;
     class SceneManager;
     class Camera;
@@ -48,10 +54,25 @@ namespace OEngine
             std::string fsaa;
         };
 
+#if defined(__APPLE__) && !defined(__LP64__)
+        class CustomRoot : public Ogre::Root {
+        public:
+            bool isQueuedEnd() const;
+
+            CustomRoot(const Ogre::String& pluginFileName = "plugins.cfg", 
+                    const Ogre::String& configFileName = "ogre.cfg", 
+                    const Ogre::String& logFileName = "Ogre.log");
+        };
+#endif
+
         class Fader;
         class OgreRenderer
         {
+#if defined(__APPLE__) && !defined(__LP64__)
+            CustomRoot *mRoot;
+#else
             Ogre::Root *mRoot;
+#endif
             Ogre::RenderWindow *mWindow;
             Ogre::SceneManager *mScene;
             Ogre::Camera *mCamera;