Changeset 7577

Timestamp:

Oct 21, 2010, 11:32:28 PM (13 years ago)

Author:

rgrieder

Message:

Trying another fix: Load plugins on OS X as we do on Linux.

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

@@ -142 +142 @@
 #endif
     }
-
-#ifdef 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

@@ -52 +52 @@
 typedef struct HINSTANCE__* hInstance;
 
-#elif defined(ORXONOX_PLATFORM_LINUX)
+#elif defined(ORXONOX_PLATFORM_UNIX)
 #    define DYNLIB_HANDLE void*
 #    define DYNLIB_LOAD( a ) dlopen( a, RTLD_LAZY | RTLD_GLOBAL)
-#    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
-#    define DYNLIB_UNLOAD( a ) dlclose( a )
-
-#elif defined(ORXONOX_PLATFORM_APPLE)
-#    define DYNLIB_HANDLE void*
-#    define DYNLIB_LOAD( a ) DynLib::mac_loadDylib( a )
 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
 #    define DYNLIB_UNLOAD( a ) dlclose( a )
@@ -116 +110 @@
 
     protected:
-
-#ifdef 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;