removed debug info

This commit is contained in:
David Anderson 2004-09-12 07:18:54 +00:00
parent 54e88bf8a8
commit 69e7cbc722
2 changed files with 62 additions and 3 deletions

View File

@ -502,6 +502,7 @@ void ConvertModuleName(const char *pathString, String &path)
} }
} }
#else #else
#ifdef __linux__
char *ptr = strstr(pathString, "amd64"); char *ptr = strstr(pathString, "amd64");
if (ptr) if (ptr)
{ {
@ -517,7 +518,7 @@ void ConvertModuleName(const char *pathString, String &path)
path.assign(pathString); path.assign(pathString);
path.append("_i386.so"); path.append("_i386.so");
} else { } else {
//check to see if this file even has an extenti //check to see if this file even has an extension
ptr = strstr(pathString, ".so"); ptr = strstr(pathString, ".so");
if (ptr) if (ptr)
{ {
@ -528,7 +529,47 @@ void ConvertModuleName(const char *pathString, String &path)
} }
} }
} }
#endif #else
char *ptr = strstr(pathString, ".dll");
if (ptr)
{
path.assign(pathString);
} else {
//prevent this from loading .so too
ptr = strstr(pathString, ".so");
if (ptr)
{
int i = 0, len = strlen(pathString), c = -1;
for (i=len-1; i>=0; i--)
{
//cut off at first _
if (pathString[i] == '_')
{
//make sure this is a valid _
if (i == len-1 || strncmp(&(pathString[i+1]), "amxx", 4) == 0)
break;
c = i;
break;
}
}
*ptr = 0;
if (c == -1)
{
path.assign(pathString);
path.append(".dll");
} else {
ptr = (char *)&(pathString[c]);
*ptr = 0;
path.assign(pathString);
path.append(".dll");
}
} else {
path.assign(pathString);
path.append(".dll");
}
}
#endif //__linux__
#endif //SMALL_CELL_SIZE==64
} }
int loadModules(const char* filename) int loadModules(const char* filename)
@ -717,6 +758,24 @@ void attachMetaModModules(PLUG_LOADTIME now, const char* filename)
ConvertModuleName(pathname, modPath); ConvertModuleName(pathname, modPath);
ConvertModuleName(mmpathname, mmPath); ConvertModuleName(mmpathname, mmPath);
CList<CFakeMeta::CFakeMetaPlugin>::iterator iter = g_FakeMeta.m_Plugins.begin();
//prevent double loading
int foundFlag = 0;
while (iter)
{
if ( strcmp( (*iter).GetPath(), mmPath.c_str() ) == 0 )
{
foundFlag = 1;
break;
}
++iter;
}
if (foundFlag)
continue;
module = DLLOAD( modPath.c_str() ); // link dll module = DLLOAD( modPath.c_str() ); // link dll

View File

@ -386,7 +386,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386" AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib" AdditionalDependencies="..\jit\jits.obj ..\zlib\zlib.lib"
OutputFile="jitrelease/amxmodx_mm.dll" OutputFile="jitrelease/amxmodx_mm.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"