Add lz4 support to MSVC.

- Include lz4 code and header in VC project files.
- Fix an issue in comp-lz4.h that prevents it from compiling under MSVC.

Signed-off-by: Fish <fish.thss@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1456434882-6009-1-git-send-email-fish.thss@gmail.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/11262
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Fish 2016-02-25 16:14:42 -05:00 committed by Gert Doering
parent 9b9187031b
commit 6a4edc7fc0
6 changed files with 26 additions and 2 deletions

View file

@ -12,6 +12,8 @@
#define ENABLE_FRAGMENT 1
#define ENABLE_HTTP_PROXY 1
#define ENABLE_LZO 1
#define ENABLE_LZ4 1
#define NEED_COMPAT_LZ4 1
#define ENABLE_MANAGEMENT 1
#define ENABLE_MULTIHOME 1
#define ENABLE_PKCS11 1

View file

@ -79,6 +79,7 @@
<ClCompile Include="compat-inet_ntop.c" />
<ClCompile Include="compat-inet_pton.c" />
<ClCompile Include="compat-daemon.c" />
<ClCompile Include="compat-lz4.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="compat.h" />

View file

@ -33,6 +33,9 @@
<ClCompile Include="compat-daemon.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="compat-lz4.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="compat.h">

View file

@ -35,6 +35,7 @@ extern const struct compress_alg lz4v2_alg;
struct lz4_workspace
{
int dummy;
};
#endif /* ENABLE_LZ4 */

View file

@ -102,6 +102,7 @@
<ClCompile Include="base64.c" />
<ClCompile Include="buffer.c" />
<ClCompile Include="clinat.c" />
<ClCompile Include="comp-lz4.c" />
<ClCompile Include="comp.c" />
<ClCompile Include="compstub.c" />
<ClCompile Include="console.c" />
@ -172,9 +173,10 @@
<ClInclude Include="buffer.h" />
<ClInclude Include="circ_list.h" />
<ClInclude Include="clinat.h" />
<ClInclude Include="common.h" />
<ClInclude Include="comp-lz4.h" />
<ClInclude Include="comp.h" />
<ClInclude Include="compstub.h" />
<ClInclude Include="common.h" />
<ClInclude Include="console.h" />
<ClInclude Include="crypto.h" />
<ClInclude Include="crypto_backend.h" />

View file

@ -207,6 +207,15 @@
<ClCompile Include="win32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="comp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="compstub.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="comp-lz4.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="base64.h">
@ -227,6 +236,12 @@
<ClInclude Include="common.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="comp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="comp-lz4.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="console.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -455,4 +470,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>