From 8949f441fd426e0fc331bebb1de1b89af495de59 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 21 Oct 2019 01:27:51 +0200 Subject: [PATCH] Also include build/msw/wx_setup.props with MSVC "Dev" binaries This file is a dependency of wxwidgets.props and must be present. Closes #18510. --- build/tools/msvs/package.bat | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/tools/msvs/package.bat b/build/tools/msvs/package.bat index 02be0b1ca3..e9b55b80bc 100755 --- a/build/tools/msvs/package.bat +++ b/build/tools/msvs/package.bat @@ -74,6 +74,11 @@ copy utils\wxrc\%VCver%_mswudll_x64\wxrc.exe lib\%VCver%_x64_dll 7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z lib\%VCver%_x64_dll\wxMSW%wxDllVers%u_*.dll lib\%VCver%_x64_dll\wxbase%wxDllVers%u_*.dll 7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z lib\%VCver%_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\%VCver%_x64_dll\wxbase%wxDllVers%u_*.pdb +rem Include the props files: we need wxwidgets.props itself and wx_setup.props +rem included from it. +7z a -t7z wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z build\msw\wx_setup.props +7z a -t7z wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z build\msw\wx_setup.props + rem Create a modified copy of wxwidgets.props suitable for use with our rem binaries: we need to enable automatic ABI-compatible MSVC version detection rem for this, so we define it in the same place where WXUSINGDLL is defined (as