From 6826aff9dcb10aac757c55dea7cf1c7ad6637e2c Mon Sep 17 00:00:00 2001 From: PB Date: Wed, 4 Nov 2020 08:41:05 +0100 Subject: [PATCH] Remove --use-temp-file from wx-config's rcflags wx-config always adds "--use-temp-file" to its rcflags to be used as a windres parameter when compiling MS Windows resources. However, this parameter is a relic from the difficult Windows 9x times and is known to break the compilation in latest GCC versions. wxWidgets does not use this parameter for its build anymore, stop using it in wx-config as well. --- sdk/wxconfig/wx-config-win.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/wxconfig/wx-config-win.cpp b/sdk/wxconfig/wx-config-win.cpp index 379f981ef2..a5e5161c63 100644 --- a/sdk/wxconfig/wx-config-win.cpp +++ b/sdk/wxconfig/wx-config-win.cpp @@ -1048,7 +1048,7 @@ class CompilerMinGW : public Compiler + addLib("version") + addLib("shlwapi") + addLib("ole32") + addLib("oleaut32"); po["libs"] += addLib("uuid") + addLib("rpcrt4") + addLib("advapi32") + addLib("wsock32") + addLib("odbc32"); */ - po["rcflags"] = addFlag("--use-temp-file") + addResDefine("__WXMSW__") + po["__WXUNIV_DEFINE_p_1"]; + po["rcflags"] = addResDefine("__WXMSW__") + po["__WXUNIV_DEFINE_p_1"]; po["rcflags"] += po["__DEBUG_DEFINE_p_1"] + po["__EXCEPTIONS_DEFINE_p_1"]; po["rcflags"] += po["__RTTI_DEFINE_p_1"] + po["__THREAD_DEFINE_p_1"] + po["__UNICODE_DEFINE_p_1"]; po["rcflags"] += po["__MSLU_DEFINE_p_1"] + po["__GFXCTX_DEFINE_p_1"] + addResIncludeDir(po["SETUPHDIR"]);