From dc3e685e3a816ba085fa1776e73e4ce9167daead Mon Sep 17 00:00:00 2001 From: Danny Scott Date: Fri, 25 Oct 2019 16:33:48 +0200 Subject: [PATCH] Fix package path when adding wx_setup.props Closes https://github.com/wxWidgets/wxWidgets/pull/1618 --- build/tools/msvs/package.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tools/msvs/package.bat b/build/tools/msvs/package.bat index e9b55b80bc..3024911e21 100755 --- a/build/tools/msvs/package.bat +++ b/build/tools/msvs/package.bat @@ -76,8 +76,8 @@ copy utils\wxrc\%VCver%_mswudll_x64\wxrc.exe lib\%VCver%_x64_dll 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 +7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z build\msw\wx_setup.props +7z a -t7z %packagePath%\%VCver%\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