Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7577


Ignore:
Timestamp:
Oct 21, 2010, 11:32:28 PM (14 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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ois_update/src/libraries/core/DynLib.cc

    r7576 r7577  
    142142#endif
    143143    }
    144 
    145 #ifdef ORXONOX_PLATFORM_APPLE
    146     /*static*/ void* DynLib::mac_loadDylib(const char* name)
    147     {
    148         std::string fullPath=name;
    149         if(name[0]!='/')
    150             fullPath = macPluginPath()+"/"+fullPath;
    151 
    152             return dlopen(fullPath.c_str(), RTLD_LAZY | RTLD_GLOBAL);
    153     }
    154 #endif
    155144}
  • code/branches/ois_update/src/libraries/core/DynLib.h

    r7576 r7577  
    5252typedef struct HINSTANCE__* hInstance;
    5353
    54 #elif defined(ORXONOX_PLATFORM_LINUX)
     54#elif defined(ORXONOX_PLATFORM_UNIX)
    5555#    define DYNLIB_HANDLE void*
    5656#    define DYNLIB_LOAD( a ) dlopen( a, RTLD_LAZY | RTLD_GLOBAL)
    57 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
    58 #    define DYNLIB_UNLOAD( a ) dlclose( a )
    59 
    60 #elif defined(ORXONOX_PLATFORM_APPLE)
    61 #    define DYNLIB_HANDLE void*
    62 #    define DYNLIB_LOAD( a ) DynLib::mac_loadDylib( a )
    6357#    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
    6458#    define DYNLIB_UNLOAD( a ) dlclose( a )
     
    116110
    117111    protected:
    118 
    119 #ifdef ORXONOX_PLATFORM_APPLE
    120         // From macUtils.h in OGRE
    121         static void* mac_loadDylib(const char* name);
    122 #endif
    123 
    124112        /// Handle to the loaded library.
    125113        DYNLIB_HANDLE m_hInst;
Note: See TracChangeset for help on using the changeset viewer.