Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Loads from non-cwd now

Browse Source
This commit is contained in:
David Anderson 2005-09-18 01:14:23 +00:00
parent f64ca6a827
commit 58dd553d00
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/amxxpc/amxxpc.cpp
View File

@ -30,7 +30,11 @@ int main(int argc, char **argv)
#endif #endif
#ifdef __linux__ #ifdef __linux__
HINSTANCE lib = dlmount("./amxxpc32.so"); HINSTANCE lib = NULL;
if (FileExists("./amxxpc32.so"))
lib = dlmount("./amxxpc32.so");
else
lib = dlmount("amxxpc32.so");
#else #else
HINSTANCE lib = dlmount("amxxpc32.dll"); HINSTANCE lib = dlmount("amxxpc32.dll");
#endif #endif
@ -101,9 +105,12 @@ int main(int argc, char **argv)
unlink(file); unlink(file);
HINSTANCE lib64 = 0; HINSTANCE lib64 = NULL;
#ifdef __linux__ #ifdef __linux__
lib64 = dlmount("./amxxpc64.so"); if (FileExists("./amxxpc64.so"))
lib64 = dlmount("./amxxpc64.so");
else
lib64 = dlmount("amxxpc64.so");
#else #else
lib64 = dlmount("amxxpc64.dll"); lib64 = dlmount("amxxpc64.dll");
#endif #endif
@ -374,3 +381,15 @@ void show_help()
printf("\t-p<name> set name of \"prefix\" file\n"); printf("\t-p<name> set name of \"prefix\" file\n");
printf("\t-r[name] write cross reference report to console or to specified file\n"); printf("\t-r[name] write cross reference report to console or to specified file\n");
} }
#ifdef __linux__
bool FileExists(const char *file)
{
FILE *fp = fopen(file, "rb");
if (!fp)
return false;
fclose(fp);
return true;
}
#endif

6
compiler/amxxpc/amxxpc.h
View File

@ -1,7 +1,7 @@
#ifndef _AMXXSC_INCLUDE_H #ifndef _AMXXSC_INCLUDE_H
#define _AMXXSC_INCLUDE_H #define _AMXXSC_INCLUDE_H
#define VERSION_STRING "1.56-300" #define VERSION_STRING "1.60-300"
#define VERSION 03000 #define VERSION 03000
#define MAGIC_HEADER 0x414D5842 #define MAGIC_HEADER 0x414D5842
#define MAGIC_HEADER2 0x414D5858 #define MAGIC_HEADER2 0x414D5858
@ -67,4 +67,8 @@ struct BinPlugin
int32_t offs; //file offset int32_t offs; //file offset
}; };
#ifdef __linux__
bool FileExists(const char *file);
#endif
#endif //_AMXXSC_INCLUDE_H #endif //_AMXXSC_INCLUDE_H