qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 15:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

made qfcc compile again, by renaming com_token to qfcc_com_token so it does not conflict with QFutil

Browse source
This commit is contained in:
Forest Hale 2002-01-04 11:12:52 +00:00
parent 9d2739598a
commit 184ff4a216
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/include/cmdlib.h
View file

@ -63,7 +63,7 @@ int LoadFile (char *filename, void **bufferptr);
char *Parse (char *data);
extern char com_token[1024];
extern char qfcc_com_token[1024];
extern qboolean com_eof;
#endif

16
tools/qfcc/source/cmdlib.c
View file

@ -50,7 +50,7 @@ static const char rcsid[] =
#define PATHSEPERATOR '/'
char com_token[1024];
char qfcc_com_token[1024];
qboolean com_eof;
/*
@ -84,7 +84,7 @@ Parse (char *data)
int c;
int len = 0;
com_token[0] = 0;
qfcc_com_token[0] = 0;
if (!data)
return NULL;
@ -111,23 +111,23 @@ Parse (char *data)
do {
c = *data++;
if (c == '\"') {
com_token[len] = 0;
qfcc_com_token[len] = 0;
return data;
}
com_token[len] = c;
qfcc_com_token[len] = c;
len++;
} while (1);
}
// parse single characters
if (c == '{' || c == '}' || c == ')' || c == '(' || c == '\'' || c == ':') {
com_token[len] = c;
qfcc_com_token[len] = c;
len++;
com_token[len] = 0;
qfcc_com_token[len] = 0;
return data + 1;
}
// parse a regular word
do {
com_token[len] = c;
qfcc_com_token[len] = c;
data++;
len++;
c = *data;
@ -136,7 +136,7 @@ Parse (char *data)
break;
} while (c > 32);
com_token[len] = 0;
qfcc_com_token[len] = 0;
return data;
}

6
tools/qfcc/source/qfcc.c
View file

@ -916,14 +916,14 @@ main (int argc, char **argv)
if (!(src = Parse (src)))
Error ("No destination filename. qfcc --help for info.\n");
strcpy (destfile, com_token);
strcpy (destfile, qfcc_com_token);
if (options.verbosity >= 1) {
printf ("outputfile: %s\n", destfile);
}
if (options.code.debug) {
char *s;
strcpy (debugfile, com_token);
strcpy (debugfile, qfcc_com_token);
s = debugfile + strlen (debugfile);
while (s-- > debugfile) {
@ -962,7 +962,7 @@ main (int argc, char **argv)
// yydebug = 1;
snprintf (filename, sizeof (filename), "%s%c%s", sourcedir,
PATH_SEPARATOR, com_token);
PATH_SEPARATOR, qfcc_com_token);
if (options.verbosity >= 2)
printf ("compiling %s\n", filename);