From 0f7387bc486aeddbc8b180a090e00c524ab02bd5 Mon Sep 17 00:00:00 2001 From: dos Date: Thu, 23 Jul 2020 09:52:26 -0300 Subject: [PATCH] Include wxbase DLLs in 64-bit Dev package too Do it for consistency with the 32-bit package and to ensure that the provided wxrc.exe binary can be run without downloading any extra files. Closes https://github.com/wxWidgets/wxWidgets/pull/1991 --- build/tools/msvs/package.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tools/msvs/package.bat b/build/tools/msvs/package.bat index c44067eb94..79b978381a 100755 --- a/build/tools/msvs/package.bat +++ b/build/tools/msvs/package.bat @@ -70,7 +70,7 @@ rem Package the 64 bit files REM Copy wxrc.exe to the dll folder. 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_Dev.7z lib\%VCver%_x64_dll\mswud lib\%VCver%_x64_dll\mswu lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\%VCver%_x64_dll\wxbase%wxDllVers%ud_*.dll lib\%VCver%_x64_dll\*.lib lib\%VCver%_x64_dll\wxrc.exe +7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z lib\%VCver%_x64_dll\mswud lib\%VCver%_x64_dll\mswu lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\%VCver%_x64_dll\wxbase%wxDllVers%u*.dll lib\%VCver%_x64_dll\*.lib lib\%VCver%_x64_dll\wxrc.exe 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