Update 7-zip to 16.04

diff --git a/ArchiveSupport/Merge7z/Merge7z.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vcxproj
index 8585771..6c5df07 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vcxproj
+++ b/ArchiveSupport/Merge7z/Merge7z.vcxproj
@@ -80,10 +80,10 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1602U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1602U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1602U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1602U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1604U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1604U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1604U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1604U</TargetName>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>\r

diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.h b/ArchiveSupport/Merge7z/Merge7zCommon.h
index e370d94..4cf0a27 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7zCommon.h
+++ b/ArchiveSupport/Merge7z/Merge7zCommon.h
@@ -13,6 +13,7 @@
 \r
 // Merge7z includes\r
 #include "tools.h"\r
+#include "../../Src/dllpstub.h"\r
 #define DllBuild_Merge7z 30\r
 #include "Merge7z.h"\r
 \r

diff --git a/Externals/versions.txt b/Externals/versions.txt
index 1d1aa58..01b15e7 100644 (file)
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -10,3 +10,4 @@ freeimage: 3.16.0
 WinIMerge: 1.0.0.0
 Google C++ Testing Framework: 1.70
 GnuWin32 Patch for Windows: 2.5.9-7
+7-zip: 16.04