Install DLLs in bindir, not libdir, when using MSW toolchains

Use the hack with __dllinstdir variable just added to bakefile to
override the installation location for the DLLs to put them into the
expected location.

Closes #14601.
This commit is contained in:
Vadim Zeitlin
2021-01-14 18:20:11 +01:00
parent 331840edb3
commit ec0734f96f
2 changed files with 38 additions and 34 deletions
+35 -34
View File
File diff suppressed because it is too large Load Diff
+3
View File
@@ -764,6 +764,9 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
<template id="wx_dll_b" template="wx_lib_b">
<set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
<if cond="FORMAT=='autoconf'">
<set var="__dllinstdir">$(DLLDIR)</set>
</if>
<dllname>$(WXDLLNAME)</dllname>
<version>$(WX_VERSION)</version>
<so_version>$(WXSOVERSION)</so_version>