Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
2 edited

Legend:

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

    r7513 r7575  
    143143    }
    144144
     145#if defined(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
    145155}
  • code/branches/ois_update/src/libraries/core/DynLib.h

    r7513 r7575  
    6060#elif defined(ORXONOX_PLATFORM_APPLE)
    6161#    define DYNLIB_HANDLE void*
    62 #    define DYNLIB_LOAD( a ) Ogre::mac_loadDylib( a )
     62#    define DYNLIB_LOAD( a ) DynLib::mac_loadDylib( a )
    6363#    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
    6464#    define DYNLIB_UNLOAD( a ) dlclose( a )
     
    117117    protected:
    118118
     119#elif defined(ORXONOX_PLATFORM_APPLE)
     120        // From macUtils.h in OGRE
     121        static void* mac_loadDylib(const char* name);
     122#endif
     123
    119124        /// Handle to the loaded library.
    120125        DYNLIB_HANDLE m_hInst;
Note: See TracChangeset for help on using the changeset viewer.