Fixed: OS X uses .dylib extension instead of .so
--HG-- branch : develop
This commit is contained in:
parent
a75ebeffa7
commit
977103f9d0
3 changed files with 6 additions and 2 deletions
|
@ -174,7 +174,8 @@ public:
|
||||||
|
|
||||||
/** Build a NeL standard library name according to platform and compilation mode setting.
|
/** Build a NeL standard library name according to platform and compilation mode setting.
|
||||||
* aka : adding decoration one base lib name.
|
* aka : adding decoration one base lib name.
|
||||||
* e.g : 'mylib' become 'mylib_rd.dll' on Windows ReleaseDebug mode or
|
* e.g : 'mylib' become 'mylib_rd.dll' on Windows ReleaseDebug mode,
|
||||||
|
* 'libmylib.dylib' under OS X or
|
||||||
* 'libmylib.so' on unix system.
|
* 'libmylib.so' on unix system.
|
||||||
*/
|
*/
|
||||||
static std::string makeLibName(const std::string &baseName);
|
static std::string makeLibName(const std::string &baseName);
|
||||||
|
|
|
@ -70,7 +70,7 @@ namespace NLNET
|
||||||
*
|
*
|
||||||
* The library name is the base name that will be 'decorated'
|
* The library name is the base name that will be 'decorated'
|
||||||
* with the nel naming standard according to compilation mode
|
* with the nel naming standard according to compilation mode
|
||||||
* and platform specific file extension (.dll or .so).
|
* and platform specific file extension (.dll, .dylib or .so).
|
||||||
*
|
*
|
||||||
* A module library can only be loaded once. If the library
|
* A module library can only be loaded once. If the library
|
||||||
* is already loaded, the call is ingored.
|
* is already loaded, the call is ingored.
|
||||||
|
|
|
@ -71,6 +71,9 @@ void *nlGetSymbolAddress(NL_LIB_HANDLE libHandle, const std::string &procName)
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
const string nlLibPrefix; // empty
|
const string nlLibPrefix; // empty
|
||||||
const string nlLibExt(".dll");
|
const string nlLibExt(".dll");
|
||||||
|
#elif defined(NL_OS_MAC)
|
||||||
|
const string nlLibPrefix("lib");
|
||||||
|
const string nlLibExt(".dylib");
|
||||||
#elif defined(NL_OS_UNIX)
|
#elif defined(NL_OS_UNIX)
|
||||||
const string nlLibPrefix("lib");
|
const string nlLibPrefix("lib");
|
||||||
const string nlLibExt(".so");
|
const string nlLibExt(".so");
|
||||||
|
|
Loading…
Reference in a new issue