zefie/llvm-mingw
1
0 Fork 0
Code Activity

windres-wrapper: Short options joined with the option value doesn't use an equals character

Browse Source 
This makes options like "-iinput.rc -ooutput.o" work properly.
This commit is contained in:
Martin Storsjö committed 2019-11-21 08:10:52 +02:00
1 parent f1168d3016
commit ce7d3ec874
1 file changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files
wrappers/windres-wrapper.c
+5 -2
View File
@@ -168,12 +168,15 @@ int _tmain(int argc, TCHAR* argv[]) {
int nb_cpp_options = 0; int nb_cpp_options = 0;
int verbose = 0; int verbose = 0;
#define _tcsstart(a, b) !_tcsncmp(a, b, sizeof(b)/sizeof(TCHAR) - 1) #define _tcslen_const(a) (sizeof(a)/sizeof(TCHAR) - 1)
#define _tcsstart(a, b) !_tcsncmp(a, b, _tcslen_const(b))
#define IF_MATCH_EITHER(short, long) \ #define IF_MATCH_EITHER(short, long) \
if (!_tcscmp(argv[i], _T(short)) || !_tcscmp(argv[i], _T(long))) if (!_tcscmp(argv[i], _T(short)) || !_tcscmp(argv[i], _T(long)))
#define OPTION(short, long, var) \ #define OPTION(short, long, var) \
if (_tcsstart(argv[i], _T(short "=")) || _tcsstart(argv[i], _T(long "="))) { \ if (_tcsstart(argv[i], _T(short)) && argv[i][_tcslen_const(_T(short))]) { \
var = argv[i] + _tcslen_const(_T(short)); \
} else if (_tcsstart(argv[i], _T(long "="))) { \
var = _tcschr(argv[i], '=') + 1; \ var = _tcschr(argv[i], '=') + 1; \
} else IF_MATCH_EITHER(short, long) { \ } else IF_MATCH_EITHER(short, long) { \
if (i + 1 < argc) \ if (i + 1 < argc) \