From 30f252f1579473df623e678fc581d21d8c9afc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 23 Jun 2020 12:53:18 +0300 Subject: [PATCH] windres-wrapper: Add support for the language option llvm-rc got support for this option on Jun 23rd [1], so the currently pinned version of llvm-project doesn't support it - but earlier versions just silently ignore the option, so it should be safe to include in the wrapper now already. [1] https://github.com/llvm/llvm-project/commit/f36f8b41beb9cc0353d5624934406d39b78753e0 --- wrappers/windres-wrapper.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wrappers/windres-wrapper.c b/wrappers/windres-wrapper.c index d3417d3..edb78c2 100644 --- a/wrappers/windres-wrapper.c +++ b/wrappers/windres-wrapper.c @@ -94,6 +94,7 @@ static void print_help(void) { " -D, --define Define to pass to preprocessor.\n" " -U, --undefine Undefine to pass to preprocessor.\n" " -c, --codepage Default codepage to use when reading an rc file (0x0-0xffff).\n" +" -l, --language Specify default language (0x0-0xffff).\n" " --use-temp-file Use a temporary file for the preprocessing output.\n" " -v, --verbose Enable verbose output.\n" " -V, --version Display version.\n" @@ -154,6 +155,7 @@ int _tmain(int argc, TCHAR* argv[]) { const TCHAR **includes = malloc(argc * sizeof(*includes)); int nb_includes = 0; const TCHAR *codepage = _T("1252"); + const TCHAR *language = NULL; const TCHAR **cpp_options = malloc(argc * sizeof(*cpp_options)); int nb_cpp_options = 0; int verbose = 0; @@ -203,6 +205,7 @@ int _tmain(int argc, TCHAR* argv[]) { } else if (_tcsstart(argv[i], _T("-I"))) { includes[nb_includes++] = argv[i] + 2; } else OPTION("-c", "--codepage", codepage) + else OPTION("-l", "--language", language) else if (!_tcscmp(argv[i], _T("--preprocessor"))) { error(basename, _T("ENOSYS")); } else if (_tcsstart(argv[i], _T("--preprocessor-arg="))) { @@ -326,6 +329,10 @@ int _tmain(int argc, TCHAR* argv[]) { exec_argv[arg++] = preproc_rc; exec_argv[arg++] = _T("-c"); exec_argv[arg++] = codepage; + if (language) { + exec_argv[arg++] = _T("-l"); + exec_argv[arg++] = language; + } exec_argv[arg++] = _T("-fo"); if (!_tcsicmp(output_format, _T("res"))) exec_argv[arg++] = output;