Changeset 7513

Timestamp:

Oct 9, 2010, 12:27:50 AM (14 years ago)

Author:

rgrieder

Message:

Updated DynLib class to the newest version in the OGRE trunk.
This should hopefully make it compile on OS X.

Location:

code/branches/ois_update/src/libraries/core

Files:

• DynLib.cc (modified) (3 diffs)
• DynLib.h (modified) (1 diff)

code/branches/ois_update/src/libraries/core/DynLib.cc

@@ -42 +42 @@
 #endif
 
-#ifdef ORXONOX_PLATFORM_LINUX
+#ifdef ORXONOX_PLATFORM_UNIX
 #  include <dlfcn.h>
 #endif
 
 #ifdef ORXONOX_PLATFORM_APPLE
-#  include <macPlugins.h>
+#   include <OSX/macUtils.h> // OGRE include
 #endif
 
@@ -75 +75 @@
         if (name.substr(name.length() - 3, 3) != ".so")
            name += ".so";
+#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+        // dlopen() does not add .dylib to the filename, like windows does for .dll
+        if (name.substr(name.length() - 6, 6) != ".dylib")
+            name += ".dylib";
+#elif OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        // Although LoadLibraryEx will add .dll itself when you only specify the library name,
+        // if you include a relative path then it does not. So, add it to be sure.
+        if (name.substr(name.length() - 4, 4) != ".dll")
+            name += ".dll";
 #endif
 
@@ -127 +136 @@
         LocalFree( lpMsgBuf );
         return ret;
-#elif defined(ORXONOX_PLATFORM_LINUX)
+#elif defined(ORXONOX_PLATFORM_UNIX)
         return std::string(dlerror());
-#elif defined(ORXONOX_PLATFORM_APPLE)
-        return std::string(mac_errorBundle());
 #else
         return "";

code/branches/ois_update/src/libraries/core/DynLib.h

@@ -59 +59 @@
 
 #elif defined(ORXONOX_PLATFORM_APPLE)
-#    define DYNLIB_HANDLE CFBundleRef
-#    define DYNLIB_LOAD( a ) Ogre::mac_loadExeBundle( a )
-#    define DYNLIB_GETSYM( a, b ) Ogre::mac_getBundleSym( a, b )
-#    define DYNLIB_UNLOAD( a ) Ogre::mac_unloadExeBundle( a )
+#    define DYNLIB_HANDLE void*
+#    define DYNLIB_LOAD( a ) Ogre::mac_loadDylib( a )
+#    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
+#    define DYNLIB_UNLOAD( a ) dlclose( a )
 #endif