#149 FIX Build for Reneval SVN r226

[VictorVG]

Diff он же и патч - иначе не соберётся.

--- archiver.cpp    SVN r226
+++ archiver.cpp    FIXED
@@ -17,8 +17,8 @@
  **************************************************************************/

 #include "archiver.h"
-#include "7z\CPP\7zip\Archive\IArchive.h"
-#include "7z\CPP\7zip\IPassword.h"
+#include "..\common\7z\CPP\7zip\Archive\IArchive.h"
+#include "..\common\7z\CPP\7zip\IPassword.h"
 #include <atlbase.h>
 #include <shlwapi.h>
 #include <shellapi.h>
--- Renewal.vcxproj SVN r226
+++ Renewal.vcxproj FIXED
@@ -150,15 +150,15 @@
     <ClCompile Include="net_url.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="7z\CPP\7zip\Archive\IArchive.h" />
-    <ClInclude Include="7z\CPP\7zip\IDecl.h" />
-    <ClInclude Include="7z\CPP\7zip\IPassword.h" />
-    <ClInclude Include="7z\CPP\7zip\IProgress.h" />
-    <ClInclude Include="7z\CPP\7zip\IStream.h" />
-    <ClInclude Include="7z\CPP\7zip\PropID.h" />
-    <ClInclude Include="7z\CPP\Common\MyUnknown.h" />
-    <ClInclude Include="7z\CPP\Common\Types.h" />
-    <ClInclude Include="7z\C\Types.h" />
+    <ClInclude Include="..\common\7z\CPP\7zip\Archive\IArchive.h" />
+    <ClInclude Include="..\common\7z\CPP\7zip\IDecl.h" />
+    <ClInclude Include="..\common\7z\CPP\7zip\IPassword.h" />
+    <ClInclude Include="..\common\7z\CPP\7zip\IProgress.h" />
+    <ClInclude Include="..\common\7z\CPP\7zip\IStream.h" />
+    <ClInclude Include="..\common\7z\CPP\7zip\PropID.h" />
+    <ClInclude Include="..\common\7z\CPP\Common\MyUnknown.h" />
+    <ClInclude Include="..\common\7z\CPP\Common\Types.h" />
+    <ClInclude Include="..\common\7z\C\Types.h" />
     <ClInclude Include="archiver.h" />
     <ClInclude Include="autocheck.h" />
     <ClInclude Include="common.h" />
--- Renewal.vcxproj.filters SVN r226
+++ Renewal.vcxproj.filters FIXED
@@ -49,31 +49,31 @@
     <ClInclude Include="tinyxml\tinyxml.h">
       <Filter>libtinyxml</Filter>
     </ClInclude>
-    <ClInclude Include="7z\C\Types.h">
+    <ClInclude Include="..\common\7z\C\Types.h">
       <Filter>lib7z</Filter>
     </ClInclude>
-    <ClInclude Include="7z\CPP\7zip\IDecl.h">
+    <ClInclude Include="..\common\7z\CPP\7zip\IDecl.h">
       <Filter>lib7z</Filter>
     </ClInclude>
-    <ClInclude Include="7z\CPP\7zip\IPassword.h">
+    <ClInclude Include="..\common\7z\CPP\7zip\IPassword.h">
       <Filter>lib7z</Filter>
     </ClInclude>
-    <ClInclude Include="7z\CPP\7zip\IProgress.h">
+    <ClInclude Include="..\common\7z\CPP\7zip\IProgress.h">
       <Filter>lib7z</Filter>
     </ClInclude>
-    <ClInclude Include="7z\CPP\7zip\IStream.h">
+    <ClInclude Include="..\common\7z\CPP\7zip\IStream.h">
       <Filter>lib7z</Filter>
     </ClInclude>
-    <ClInclude Include="7z\CPP\7zip\PropID.h">
+    <ClInclude Include="..\common\7z\CPP\7zip\PropID.h">
       <Filter>lib7z</Filter>
     </ClInclude>
-    <ClInclude Include="7z\CPP\7zip\Archive\IArchive.h">
+    <ClInclude Include="..\common\7z\CPP\7zip\Archive\IArchive.h">
       <Filter>lib7z</Filter>
     </ClInclude>
-    <ClInclude Include="7z\CPP\Common\MyUnknown.h">
+    <ClInclude Include="..\common\7z\CPP\Common\MyUnknown.h">
       <Filter>lib7z</Filter>
     </ClInclude>
-    <ClInclude Include="7z\CPP\Common\Types.h">
+    <ClInclude Include="..\common\7z\CPP\Common\Types.h">
       <Filter>lib7z</Filter>
     </ClInclude>
     <ClInclude Include="archiver.h" />

P.S.

я специально так сделал - надёжнее. Лишим компилятор и ос возможности ошибки при поиске файлов.

[Vladimir Surguchev]

просто не надо бежать перед паравозом.

[VictorVG]

Знаю, просто была минута поробовать - сделал. А вот sniffer пока не собирается, интересно что выйдет?

[Vladimir Surguchev]

Renewal будет переделываться на использование общего 7z кода.
Закоммичу когда всё будет готово.
Sniffer я никогда не собирал, а сборку Артёма вполне мог сломать из-за реорганизации каталогов. Если что-то там будет правиться - починю, пока планов его трогать нет.