Changeset 7575

Timestamp:

Oct 21, 2010, 11:16:39 PM (14 years ago)

Author:

rgrieder

Message:

Copied code for Ogre::mac_loadDylib to DynLib.h because the symbol doesn't get exported to the Ogre library.

Location:

code/branches/ois_update/src/libraries/core

Files:

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

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

@@ -143 +143 @@
     }
 
+#if defined(ORXONOX_PLATFORM_APPLE)
+    /*static*/ void* DynLib::mac_loadDylib(const char* name)
+    {
+        std::string fullPath=name;
+        if(name[0]!='/')
+            fullPath = macPluginPath()+"/"+fullPath;
+
+            return dlopen(fullPath.c_str(), RTLD_LAZY | RTLD_GLOBAL);
+    }
+#endif
 }

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

@@ -60 +60 @@
 #elif defined(ORXONOX_PLATFORM_APPLE)
 #    define DYNLIB_HANDLE void*
-#    define DYNLIB_LOAD( a ) Ogre::mac_loadDylib( a )
+#    define DYNLIB_LOAD( a ) DynLib::mac_loadDylib( a )
 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
 #    define DYNLIB_UNLOAD( a ) dlclose( a )
@@ -117 +117 @@
     protected:
 
+#elif defined(ORXONOX_PLATFORM_APPLE)
+        // From macUtils.h in OGRE
+        static void* mac_loadDylib(const char* name);
+#endif
+
         /// Handle to the loaded library.
         DYNLIB_HANDLE m_hInst;