diff options
author | Lev Stipakov <lstipakov@gmail.com> | 2015-10-02 14:46:41 +0300 |
---|---|---|
committer | Gert Doering <gert@greenie.muc.de> | 2015-10-06 12:45:46 +0200 |
commit | 123092a7a95f13f0509d2dc52ec049f91a02686d (patch) | |
tree | 9b6a3a60e7dfe4f9f4d968c36ca146ad76ba0cba /src/openvpn | |
parent | 5fcd49336812053aa1503078c0ebb72a2737a6b8 (diff) | |
download | openvpn-123092a7a95f13f0509d2dc52ec049f91a02686d.tar.gz openvpn-123092a7a95f13f0509d2dc52ec049f91a02686d.tar.xz openvpn-123092a7a95f13f0509d2dc52ec049f91a02686d.zip |
This fixes MSVS 2013 compilation.
* Tools version changed to 12
* Added comp.c/h and compat.c/h to project files
* Workaround for missing __attribute__ support
Also, as a preparation for MSVS2015, ensured that snprintf is not defined
for that VS version.
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1443786401-30416-1-git-send-email-lstipakov@gmail.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/10174
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn')
-rwxr-xr-x | src/openvpn/openvpn.vcxproj | 10 | ||||
-rw-r--r-- | src/openvpn/syshead.h | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 3b2340e..b117b0b 100755 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,10 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -100,6 +102,8 @@ <ClCompile Include="base64.c" /> <ClCompile Include="buffer.c" /> <ClCompile Include="clinat.c" /> + <ClCompile Include="comp.c" /> + <ClCompile Include="compstub.c" /> <ClCompile Include="console.c" /> <ClCompile Include="crypto.c" /> <ClCompile Include="crypto_openssl.c" /> @@ -168,6 +172,8 @@ <ClInclude Include="buffer.h" /> <ClInclude Include="circ_list.h" /> <ClInclude Include="clinat.h" /> + <ClInclude Include="comp.h" /> + <ClInclude Include="compstub.h" /> <ClInclude Include="common.h" /> <ClInclude Include="console.h" /> <ClInclude Include="crypto.h" /> @@ -260,4 +266,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index ba3b7e4..3aa5c5f 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -47,6 +47,7 @@ #ifdef _MSC_VER // Visual Studio #define __func__ __FUNCTION__ +#define __attribute__(x) #endif #if defined(__APPLE__) |