gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow specifying multiple dependency targets

Browse Source 
This is done to match GCC's behavior.
Also, this unifies the code of -MT and -MQ.
This commit is contained in:
ISSOtm
2019-09-10 03:50:54 +02:00
parent f1f314270d
commit 0649b360fb
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/asm/main.c
View File

@@ -246,8 +246,7 @@ static char *make_escape(const char *str)
char *dest = escaped_str; char *dest = escaped_str;
if (escaped_str == NULL) if (escaped_str == NULL)
errx(1, "%s: Failed to allocate memory: %s", __func__, err(1, "%s: Failed to allocate memory", __func__);
strerror(errno));
while (*str) { while (*str) {
/* All dollars needs to be doubled */ /* All dollars needs to be doubled */
@@ -295,8 +294,8 @@ static void print_usage(void)
{ {
fputs( fputs(
"Usage: rgbasm [-EhLVvw] [-b chars] [-D name[=value]] [-g chars] [-i path]\n" "Usage: rgbasm [-EhLVvw] [-b chars] [-D name[=value]] [-g chars] [-i path]\n"
" [-M depend_file] [-MP] [-MT target_file] [-o out_file]\n" " [-M depend_file] [-MP] [-MT target_file] [-MQ target_file]\n"
" [-p pad_value] [-r depth] [-W warning] <file> ...\n" " [-o out_file] [-p pad_value] [-r depth] [-W warning] <file> ...\n"
"Useful options:\n" "Useful options:\n"
" -E, --export-all export all labels\n" " -E, --export-all export all labels\n"
" -M, --dependfile <path> set the output dependency file\n" " -M, --dependfile <path> set the output dependency file\n"
@@ -333,6 +332,7 @@ int main(int argc, char *argv[])
nMaxRecursionDepth = 64; nMaxRecursionDepth = 64;
oGeneratePhonyDeps = false; oGeneratePhonyDeps = false;
tzTargetFileName = NULL; tzTargetFileName = NULL;
size_t nTargetFileNameLen = 0;
DefaultOptions.gbgfx[0] = '0'; DefaultOptions.gbgfx[0] = '0';
DefaultOptions.gbgfx[1] = '1'; DefaultOptions.gbgfx[1] = '1';
@@ -400,17 +400,28 @@ int main(int argc, char *argv[])
oGeneratePhonyDeps = true; oGeneratePhonyDeps = true;
break; break;
case 'Q': case 'Q':
if (optind == argc)
errx(1, "-MQ takes a target file name argument");
tzTargetFileName =
make_escape(argv[optind]);
optind++;
break;
case 'T': case 'T':
if (optind == argc) if (optind == argc)
errx(1, "-MT takes a target file name argument"); errx(1, "-M%c takes a target file name argument",
tzTargetFileName = argv[optind]; optarg[0]);
ep = argv[optind];
optind++; optind++;
if (optarg[0] == 'Q')
ep = make_escape(ep);
nTargetFileNameLen += strlen(ep) + 1;
tzTargetFileName =
realloc(tzTargetFileName,
nTargetFileNameLen + 1);
if (tzTargetFileName == NULL)
err(1, "Cannot append new file to target file list");
strcat(tzTargetFileName, ep);
if (optarg[0] == 'Q')
free(ep);
char *ptr = tzTargetFileName +
strlen(tzTargetFileName);
*ptr++ = ' ';
*ptr = '\0';
break; break;
} }
} }