Changeset 35 for code/branches/tutorial/Tutorial/src/ExampleApplication.h

Timestamp:

Oct 11, 2007, 10:35:49 AM (17 years ago)

Author:

nicolasc

Message:

reset all files to original state
included all win32/macosx ifdefs…

File:

• code/branches/tutorial/Tutorial/src/ExampleApplication.h (modified) (4 diffs)

code/branches/tutorial/Tutorial/src/ExampleApplication.h

@@ -26 +26 @@
 #include "ExampleFrameListener.h"
 
-#if 0
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
 #include <CoreFoundation/CoreFoundation.h>
@@ -53 +52 @@
 }
 #endif
-#endif
 
 using namespace Ogre;
@@ -71 +69 @@
                 // On windows files are searched for in the current working directory, on OS X however
                 // you must provide the full path, the helper function macBundlePath does this for us.
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+                mResourcePath = macBundlePath() + "/Contents/Resources/";
+#else
                 mResourcePath = "";
+#endif
     }
     /// Standard destructor
@@ -219 +221 @@
                 typeName = i->first;
                 archName = i->second;
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+                // OS X does not set the working directory relative to the app,
+                // In order to make things portable on OS X we need to provide
+                // the loading with it's own bundle path location
+                ResourceGroupManager::getSingleton().addResourceLocation(
+                    String(macBundlePath() + "/" + archName), typeName, secName);
+#else
                 ResourceGroupManager::getSingleton().addResourceLocation(
                     archName, typeName, secName);
+#endif
             }
         }