rln
/
rln
mirror of http://shamusworld.gotdns.org/git/rln
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for bug #132 (warnings for non-exclusive options). 

Thanks to LinkoVitch for the report; now at v1.6.4.
This commit is contained in:
Shamus Hammons 2020-02-28 17:57:27 -06:00
parent e0c5bd1817
commit 459661e27f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rln.c
View File

@ -2851,6 +2851,10 @@ int doargs(int argc, char * argv[])
case 'e':
case 'E': // Output COFF (absolute only)
cflag = 1;
if (noheaderflag)
printf("Warning: -e overridden by -n, output will be headerless\n");
break;
case 'g':
case 'G': // Output source level debugging
@ -2909,6 +2913,9 @@ int doargs(int argc, char * argv[])
if (noheaderflag)
warn('n', 1);
if (cflag)
printf("Warning: -e overridden by -n, output will be headerless\n");
noheaderflag = 1;
break;
case 'o':
@ -3060,7 +3067,7 @@ void ShowHelp(void)
printf("\n");
printf("Options:\n");
printf(" -? or -h display usage information\n");
printf(" -a <text> <data> <bss> output absolute file\n");
printf(" -a <text> <data> <bss> output absolute file (default: ABS)\n");
printf(" hex value: segment address\n");
printf(" r: relocatable segment\n");
printf(" x: contiguous segment\n");
@ -3073,7 +3080,7 @@ void ShowHelp(void)
printf(" -ii <fname> <label> incbin <fname> and set <label> (no truncation)\n");
printf(" -l add local symbols\n");
printf(" -m produce load symbols map\n");
printf(" -n output no file header to absolute file\n");
printf(" -n output no file header to absolute file (overrides -e)\n");
printf(" -o <fname> set output name\n");
printf(" -r<size> section alignment size\n");
printf(" w: word (2 bytes)\n");

2
rln.h
View File

@ -44,7 +44,7 @@
#define MAJOR 1 // Major version number
#define MINOR 6 // Minor version number
#define PATCH 3 // Patch release number
#define PATCH 4 // Patch release number
#ifdef WIN32
#define PLATFORM "Win32" // Release platform - Windows