diff options
| author | Fish | 2016-02-25 16:14:42 -0500 |
|---|---|---|
| committer | Gert Doering | 2016-02-26 08:36:24 +0100 |
| commit | 6a4edc7fc09d6a321f87d4dcf331c7d5c3082a8f (patch) | |
| tree | af347f3e2af4583271185653171b69fe946a7b46 /src/openvpn | |
| parent | 9b9187031b742258b518dbde648326b3e3a8d8d8 (diff) | |
| download | openvpn-6a4edc7fc09d6a321f87d4dcf331c7d5c3082a8f.zip openvpn-6a4edc7fc09d6a321f87d4dcf331c7d5c3082a8f.tar.gz | |
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>
Diffstat (limited to 'src/openvpn')
| -rw-r--r-- | src/openvpn/comp-lz4.h | 1 | ||||
| -rw-r--r-- | src/openvpn/openvpn.vcxproj | 4 | ||||
| -rw-r--r-- | src/openvpn/openvpn.vcxproj.filters | 17 |
3 files changed, 20 insertions, 2 deletions
diff --git a/src/openvpn/comp-lz4.h b/src/openvpn/comp-lz4.h index 9d3c664..7774ca5 100644 --- a/src/openvpn/comp-lz4.h +++ b/src/openvpn/comp-lz4.h @@ -35,6 +35,7 @@ extern const struct compress_alg lz4v2_alg; struct lz4_workspace { + int dummy; }; #endif /* ENABLE_LZ4 */ diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 821c46c..8dfbea5 100644 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -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" /> diff --git a/src/openvpn/openvpn.vcxproj.filters b/src/openvpn/openvpn.vcxproj.filters index 40336ba..8b6a269 100644 --- a/src/openvpn/openvpn.vcxproj.filters +++ b/src/openvpn/openvpn.vcxproj.filters @@ -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>
\ No newline at end of file +</Project> |