Changeset 35

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…

Location:

code/branches/tutorial/Tutorial/src

Files:

• ExampleApplication.h (modified) (4 diffs)
• ExampleFrameListener.h (modified) (2 diffs)
• main.cpp (modified) (2 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
             }
         }

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

@@ -50 +50 @@
 {
 protected:
-
         void updateStats(void)
         {
@@ -84 +83 @@
                         guiDbg->setCaption(mDebugText);
                 }
-                catch(...) { }
+                catch(...) { /* ignore */ }
         }
 

code/branches/tutorial/Tutorial/src/main.cpp

@@ -58 +58 @@
 };
 
-//#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-//#define WIN32_LEAN_AND_MEAN
-//#include "windows.h"
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#define WIN32_LEAN_AND_MEAN
+#include "windows.h"
 
-//INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
-//#else
+INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
+#else
 int main(int argc, char **argv)
-//#endif
+#endif
 {
     // Create application object
@@ -73 +73 @@
         app.go();
     } catch( Exception& e ) {
-//#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-//        MessageBox( NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-//#else
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        MessageBox( NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+#else
         fprintf(stderr, "An exception has occurred: %s\n",
                 e.getFullDescription().c_str());
-//#endif
+#endif
     }