fixed linux build
--HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40957
This commit is contained in:
parent
bdf651634c
commit
29f36e2e3f
@ -287,9 +287,9 @@ SMCParseResult CGameConfig::ReadSMC_LeavingSection()
|
|||||||
void *addrInBase = NULL;
|
void *addrInBase = NULL;
|
||||||
if (strcmp(s_TempSig.library, "server") == 0)
|
if (strcmp(s_TempSig.library, "server") == 0)
|
||||||
{
|
{
|
||||||
addrInBase = g_SMAPI->serverFactory(false);
|
addrInBase = (void *)g_SMAPI->serverFactory(false);
|
||||||
} else if (strcmp(s_TempSig.library, "engine") == 0) {
|
} else if (strcmp(s_TempSig.library, "engine") == 0) {
|
||||||
addrInBase = g_SMAPI->engineFactory(false);
|
addrInBase = (void *)g_SMAPI->engineFactory(false);
|
||||||
}
|
}
|
||||||
void *final_addr = NULL;
|
void *final_addr = NULL;
|
||||||
if (addrInBase == NULL)
|
if (addrInBase == NULL)
|
||||||
@ -299,7 +299,7 @@ SMCParseResult CGameConfig::ReadSMC_LeavingSection()
|
|||||||
m_pFile);
|
m_pFile);
|
||||||
} else {
|
} else {
|
||||||
#if defined PLATFORM_LINUX
|
#if defined PLATFORM_LINUX
|
||||||
if (s_TempSig.sig_lin[0] == '@')
|
if (s_TempSig.sig[0] == '@')
|
||||||
{
|
{
|
||||||
Dl_info info;
|
Dl_info info;
|
||||||
/* GNU only: returns 0 on error, inconsistent! >:[ */
|
/* GNU only: returns 0 on error, inconsistent! >:[ */
|
||||||
@ -308,7 +308,7 @@ SMCParseResult CGameConfig::ReadSMC_LeavingSection()
|
|||||||
void *handle = dlopen(info.dli_fname, RTLD_NOW);
|
void *handle = dlopen(info.dli_fname, RTLD_NOW);
|
||||||
if (handle)
|
if (handle)
|
||||||
{
|
{
|
||||||
final_addr = dlsym(handle, &s_TempSig.sig_lin[1]);
|
final_addr = dlsym(handle, &s_TempSig.sig[1]);
|
||||||
dlclose(handle);
|
dlclose(handle);
|
||||||
} else {
|
} else {
|
||||||
g_Logger.LogError("[SM] Unable to load library \"%s\" (gameconf \"%s\")",
|
g_Logger.LogError("[SM] Unable to load library \"%s\" (gameconf \"%s\")",
|
||||||
@ -323,7 +323,7 @@ SMCParseResult CGameConfig::ReadSMC_LeavingSection()
|
|||||||
if (!final_addr)
|
if (!final_addr)
|
||||||
{
|
{
|
||||||
g_Logger.LogError("[SM] Unable to find named symbol (symbol \"%s\") (library \"%s\") (gameconf \"%s\")",
|
g_Logger.LogError("[SM] Unable to find named symbol (symbol \"%s\") (library \"%s\") (gameconf \"%s\")",
|
||||||
&s_TempSig.sig_lin[1],
|
&s_TempSig.sig[1],
|
||||||
s_TempSig.library,
|
s_TempSig.library,
|
||||||
m_pFile);
|
m_pFile);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user