UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable binreloc for OS X.

Browse Source
This commit is contained in:
David Anderson 2014-07-23 23:21:03 -07:00
parent 654dcd8ff0
commit f41b3a2b06
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sourcepawn/compiler/AMBuilder
View File

@ -70,7 +70,7 @@ binary.sources += [
'zlib/zutil.c', 'zlib/zutil.c',
'sp_symhash.c' 'sp_symhash.c'
] ]
if builder.target_platform == 'linux': if builder.target_platform != 'windows':
binary.sources.append('binreloc.c') binary.sources.append('binreloc.c')
SM.spcomp = builder.Add(binary) SM.spcomp = builder.Add(binary)

6
sourcepawn/compiler/sc1.c
View File

@ -1196,9 +1196,6 @@ static void setopt(int argc,char **argv,char *oname,char *ename,char *pname,
#endif #endif
static void setconfig(char *root) static void setconfig(char *root)
{ {
#if defined macintosh
insert_path(":include:");
#else
char path[_MAX_PATH]; char path[_MAX_PATH];
char *ptr,*base; char *ptr,*base;
int len; int len;
@ -1206,7 +1203,7 @@ static void setconfig(char *root)
/* add the default "include" directory */ /* add the default "include" directory */
#if defined __WIN32__ || defined _WIN32 #if defined __WIN32__ || defined _WIN32
GetModuleFileNameA(NULL,path,_MAX_PATH); GetModuleFileNameA(NULL,path,_MAX_PATH);
#elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ #elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined DARWIN
/* see www.autopackage.org for the BinReloc module */ /* see www.autopackage.org for the BinReloc module */
br_init_lib(NULL); br_init_lib(NULL);
ptr=br_find_exe("spcomp"); ptr=br_find_exe("spcomp");
@ -1215,7 +1212,6 @@ static void setconfig(char *root)
#else #else
if (root!=NULL) if (root!=NULL)
strlcpy(path,root,sizeof path); /* path + filename (hopefully) */ strlcpy(path,root,sizeof path); /* path + filename (hopefully) */
#endif
# if defined __MSDOS__ # if defined __MSDOS__
/* strip the options (appended to the path + filename) */ /* strip the options (appended to the path + filename) */
if ((ptr=strpbrk(path," \t/"))!=NULL) if ((ptr=strpbrk(path," \t/"))!=NULL)