zdoom/acc
0
0
Fork 0
mirror of https://github.com/ZDoom/acc.git synced 2024-11-15 00:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Visual C++ 6.0 does not have _get_pgmptr(). You just access the variable directly with that version.

Browse source 
- Silenced some conversion warnings made by VC++ 6.
- Added the current working directory (.) as an automatic include directory, just ahead of
  the program directory, for compatibility with older ACCs that had no include path handling.

SVN r2016 (trunk)
This commit is contained in:
Randy Heit 2009-12-04 01:15:08 +00:00
parent 35632f91fe
commit 0dcf40afe6
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
acc.c
View file

@ -243,6 +243,7 @@ static void ProcessArgs(void)
DisplayUsage(); DisplayUsage();
} }
TK_AddIncludePath(".");
TK_AddProgramIncludePath(ArgVector[0]); TK_AddProgramIncludePath(ArgVector[0]);
if(count == 1) if(count == 1)

10
parse.c
View file

@ -1700,8 +1700,8 @@ static void LeadingFunction()
} }
else else
{ {
PC_AppendByte(argCount); PC_AppendByte((U_BYTE)argCount);
PC_AppendWord(specialValue); PC_AppendWord((U_WORD)specialValue);
} }
PC_AppendCmd(PCD_DROP); PC_AppendCmd(PCD_DROP);
TK_NextToken(); TK_NextToken();
@ -3304,7 +3304,7 @@ static void ExprLineSpecial(void)
} }
else else
{ {
PC_AppendByte(specialValue); PC_AppendByte((U_BYTE)specialValue);
} }
} }
else else
@ -3319,8 +3319,8 @@ static void ExprLineSpecial(void)
} }
else else
{ {
PC_AppendByte(argCount); PC_AppendByte((U_BYTE)argCount);
PC_AppendWord(-specialValue); PC_AppendWord((U_WORD)-specialValue);
} }
} }
} }

6
token.c
View file

@ -332,6 +332,7 @@ void TK_AddIncludePath(char *sourcePath)
// Add a directory delimiter to the include path // Add a directory delimiter to the include path
strcat(IncludePaths[NumIncludePaths], "/"); strcat(IncludePaths[NumIncludePaths], "/");
} }
MS_Message(MSG_DEBUG, "Add include path %d: \"%s\"\n", NumIncludePaths, IncludePaths[NumIncludePaths]);
NumIncludePaths++; NumIncludePaths++;
} }
} }
@ -349,10 +350,14 @@ void TK_AddProgramIncludePath(char *progname)
{ {
#ifdef _WIN32 #ifdef _WIN32
#ifdef _MSC_VER #ifdef _MSC_VER
#if _MSC_VER >= 1300
if (_get_pgmptr(&progname) != 0) if (_get_pgmptr(&progname) != 0)
{ {
return; return;
} }
#else
progname = _pgmptr;
#endif
#else #else
char progbuff[1024]; char progbuff[1024];
GetModuleFileName(0, progbuff, sizeof(progbuff)); GetModuleFileName(0, progbuff, sizeof(progbuff));
@ -369,6 +374,7 @@ void TK_AddProgramIncludePath(char *progname)
strcpy(IncludePaths[NumIncludePaths], progname); strcpy(IncludePaths[NumIncludePaths], progname);
if(MS_StripFilename(IncludePaths[NumIncludePaths])) if(MS_StripFilename(IncludePaths[NumIncludePaths]))
{ {
MS_Message(MSG_DEBUG, "Program include path is %d: \"%s\"\n", NumIncludePaths, IncludePaths[NumIncludePaths]);
NumIncludePaths++; NumIncludePaths++;
} }
} }