Don't use internal lzo library. Use external one. And fix crash in sr…

…c/utils/xrCompress/main.cpp at application exit.
OpenXRay · Dec 17, 2017 · 1fc8dd7 · 1fc8dd7
1 parent 502f51d
commit 1fc8dd7
Show file tree

Hide file tree

Showing 131 changed files with 29 additions and 17,472 deletions.
diff --git a/src/utils/CompressionTest/CompressionTest.cpp b/src/utils/CompressionTest/CompressionTest.cpp
@@ -6,8 +6,8 @@
 
 #pragma warning(push)
 #pragma warning(disable : 193 128 810)
-#include "utils/xrCompress/lzo/lzo1x.h"
-#include "utils/xrCompress/lzo/lzo1y.h"
+#include "lzo/lzo1x.h"
+#include "lzo/lzo1y.h"
 #pragma warning(pop)
 
 extern compression::ppmd::stream* trained_model;

diff --git a/src/utils/CompressionTest/CompressionTest.vcxproj b/src/utils/CompressionTest/CompressionTest.vcxproj
@@ -101,6 +101,7 @@
  </Link>
  <ClCompile>
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <AdditionalIncludeDirectories>$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -109,6 +110,7 @@
  </Link>
  <ClCompile>
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <AdditionalIncludeDirectories>$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -117,6 +119,7 @@
  </Link>
  <ClCompile>
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <AdditionalIncludeDirectories>$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -125,6 +128,7 @@
  </Link>
  <ClCompile>
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <AdditionalIncludeDirectories>$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
@@ -133,6 +137,7 @@
  </Link>
  <ClCompile>
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <AdditionalIncludeDirectories>$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
@@ -141,6 +146,7 @@
  </Link>
  <ClCompile>
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <AdditionalIncludeDirectories>$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
@@ -150,116 +156,16 @@
  <ClInclude Include="..\..\xrCore\PPMd.h" />
  <ClInclude Include="..\..\xrCore\PPMdType.h" />
  <ClInclude Include="..\..\xrCore\SubAlloc.hpp" />
- <ClInclude Include="..\xrCompress\lzo\compr1b.h" />
- <ClInclude Include="..\xrCompress\lzo\compr1c.h" />
- <ClInclude Include="..\xrCompress\lzo\config1.h" />
- <ClInclude Include="..\xrCompress\lzo\config1a.h" />
- <ClInclude Include="..\xrCompress\lzo\config1b.h" />
- <ClInclude Include="..\xrCompress\lzo\config1c.h" />
- <ClInclude Include="..\xrCompress\lzo\config1f.h" />
- <ClInclude Include="..\xrCompress\lzo\config1x.h" />
- <ClInclude Include="..\xrCompress\lzo\config1y.h" />
- <ClInclude Include="..\xrCompress\lzo\config1z.h" />
- <ClInclude Include="..\xrCompress\lzo\config2a.h" />
- <ClInclude Include="..\xrCompress\lzo\fake16.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo16bit.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1a.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1a_de.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1b.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1b_cc.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1b_de.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1c.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1c_cc.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1f.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1x.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1y.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo1z.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo2a.h" />
- <ClInclude Include="..\xrCompress\lzo\lzoconf.h" />
- <ClInclude Include="..\xrCompress\lzo\lzoutil.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo_conf.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo_dict.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo_ptr.h" />
- <ClInclude Include="..\xrCompress\lzo\lzo_util.h" />
- <ClInclude Include="..\xrCompress\lzo\stats1a.h" />
- <ClInclude Include="..\xrCompress\lzo\stats1b.h" />
- <ClInclude Include="..\xrCompress\lzo\stats1c.h" />
  </ItemGroup>
  <ItemGroup>
  <ClCompile Include="..\..\xrCore\Model.cpp" />
- <ClCompile Include="..\xrCompress\lzo\alloc.c" />
- <ClCompile Include="..\xrCompress\lzo\io.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1a.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1a_99.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_2.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_3.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_4.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_5.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_6.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_7.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_8.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_9.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_99.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_9x.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_cc.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_d1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_d2.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_rr.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1b_xx.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_2.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_3.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_4.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_5.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_6.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_7.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_8.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_9.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_99.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_9x.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_cc.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_d1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_d2.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_rr.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1c_xx.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1f_1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1f_9x.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1f_d1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1f_d2.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1x_1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1x_1k.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1x_1l.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1x_1o.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1x_9x.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1x_d1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1x_d2.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1x_d3.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1x_o.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1y_1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1y_9x.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1y_d1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1y_d2.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1y_d3.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1y_o.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1z_9x.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1z_d1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1z_d2.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1z_d3.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo1_99.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo2a_9x.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo2a_d1.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo2a_d2.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo_crc.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo_dll.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo_init.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo_ptr.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo_str.c" />
- <ClCompile Include="..\xrCompress\lzo\lzo_util.c" />
  <ClCompile Include="CompressionTest.cpp" />
  </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Externals\lzo.vcxproj">
+ <Project>{614aa57f-58d7-45a8-a5ff-93f04b05fac6}</Project>
+ </ProjectReference>
+ </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>