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

Merge pull request #113 from VoiDeD/spcomp-include-path

Browse Source 
Fix not adding the "include" directory to the spcomp search path.
This commit is contained in:
Asher Baker 2014-07-24 22:23:43 +01:00
commit 803a54b773
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sourcepawn/compiler/sc1.c
View File

@ -1212,11 +1212,14 @@ 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)
*ptr='\0'; *ptr='\0';
# endif # endif /* __MSDOS__ */
/* terminate just behind last \ or : */ /* terminate just behind last \ or : */
if ((ptr=strrchr(path,DIRSEP_CHAR))!=NULL || (ptr=strchr(path,':'))!=NULL) { if ((ptr=strrchr(path,DIRSEP_CHAR))!=NULL || (ptr=strchr(path,':'))!=NULL) {
/* If there is no "\" or ":", the string probably does not contain the /* If there is no "\" or ":", the string probably does not contain the
@ -1246,19 +1249,20 @@ static void setconfig(char *root)
} /* if */ } /* if */
} /* if */ } /* if */
insert_path(path); insert_path(path);
/* same for the codepage root */ /* same for the codepage root */
# if !defined NO_CODEPAGE # if !defined NO_CODEPAGE
*ptr='\0'; *ptr='\0';
if (!cp_path(path,"codepage")) if (!cp_path(path,"codepage"))
error(169,path); /* codepage path */ error(169,path); /* codepage path */
# endif # endif /* !NO_CODEPAGE */
/* also copy the root path (for the XML documentation) */ /* also copy the root path (for the XML documentation) */
# if !defined SC_LIGHT # if !defined SC_LIGHT
*ptr='\0'; *ptr='\0';
strcpy(sc_rootpath,path); strcpy(sc_rootpath,path);
# endif # endif /* !SC_LIGHT */
} /* if */ } /* if */
#endif /* macintosh */
} }
static void setcaption(void) static void setcaption(void)