Update for Visual Studio 2015
authorDean
Wed, 03 Aug 2016 08:33:41 -0700
changeset 971158b15e9d626
parent 966 901d1362fef3
child 974 c9a5b9b58f2c
Update for Visual Studio 2015
asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj
pEpEngine.vcxproj
src/platform_windows.h
     1.1 --- a/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj	Tue Aug 02 14:02:25 2016 +0200
     1.2 +++ b/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj	Wed Aug 03 08:33:41 2016 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  <?xml version="1.0" encoding="utf-8"?>
     1.5 -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     1.6 +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     1.7    <ItemGroup Label="ProjectConfigurations">
     1.8      <ProjectConfiguration Include="Debug|Win32">
     1.9        <Configuration>Debug</Configuration>
    1.10 @@ -19,13 +19,13 @@
    1.11    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    1.12      <ConfigurationType>StaticLibrary</ConfigurationType>
    1.13      <UseDebugLibraries>true</UseDebugLibraries>
    1.14 -    <PlatformToolset>v120</PlatformToolset>
    1.15 +    <PlatformToolset>v140</PlatformToolset>
    1.16      <CharacterSet>Unicode</CharacterSet>
    1.17    </PropertyGroup>
    1.18    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    1.19      <ConfigurationType>StaticLibrary</ConfigurationType>
    1.20      <UseDebugLibraries>false</UseDebugLibraries>
    1.21 -    <PlatformToolset>v120</PlatformToolset>
    1.22 +    <PlatformToolset>v140</PlatformToolset>
    1.23      <WholeProgramOptimization>true</WholeProgramOptimization>
    1.24      <CharacterSet>Unicode</CharacterSet>
    1.25    </PropertyGroup>
    1.26 @@ -54,6 +54,7 @@
    1.27        <WarningLevel>Level3</WarningLevel>
    1.28        <Optimization>Disabled</Optimization>
    1.29        <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.30 +	  <CompileAs>Default</CompileAs>
    1.31      </ClCompile>
    1.32      <Link>
    1.33        <SubSystem>Windows</SubSystem>
     2.1 --- a/pEpEngine.vcxproj	Tue Aug 02 14:02:25 2016 +0200
     2.2 +++ b/pEpEngine.vcxproj	Wed Aug 03 08:33:41 2016 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  <?xml version="1.0" encoding="utf-8"?>
     2.5 -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2.6 +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2.7    <ItemGroup Label="ProjectConfigurations">
     2.8      <ProjectConfiguration Include="Debug|Win32">
     2.9        <Configuration>Debug</Configuration>
    2.10 @@ -14,18 +14,19 @@
    2.11      <ProjectGuid>{146E69F8-E1DA-456A-B048-6DD29D9ACF6B}</ProjectGuid>
    2.12      <Keyword>Win32Proj</Keyword>
    2.13      <RootNamespace>pEpEngine</RootNamespace>
    2.14 +	<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
    2.15    </PropertyGroup>
    2.16    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    2.17    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    2.18      <ConfigurationType>DynamicLibrary</ConfigurationType>
    2.19      <UseDebugLibraries>true</UseDebugLibraries>
    2.20 -    <PlatformToolset>v120</PlatformToolset>
    2.21 +    <PlatformToolset>v140</PlatformToolset>
    2.22      <CharacterSet>Unicode</CharacterSet>
    2.23    </PropertyGroup>
    2.24    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2.25      <ConfigurationType>DynamicLibrary</ConfigurationType>
    2.26      <UseDebugLibraries>false</UseDebugLibraries>
    2.27 -    <PlatformToolset>v120</PlatformToolset>
    2.28 +    <PlatformToolset>v140</PlatformToolset>
    2.29      <WholeProgramOptimization>true</WholeProgramOptimization>
    2.30      <CharacterSet>Unicode</CharacterSet>
    2.31    </PropertyGroup>
    2.32 @@ -48,7 +49,7 @@
    2.33    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    2.34      <LinkIncremental>false</LinkIncremental>
    2.35      <IncludePath>$(ProjectDir)\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GNU\GnuPG\include;$(IncludePath)</IncludePath>
    2.36 -	<LibraryPath>$(ProjectDir)\..\libetpan\build-windows\Release;$(LibraryPath)</LibraryPath>
    2.37 +    <LibraryPath>$(ProjectDir)\..\libetpan\build-windows\Release;$(LibraryPath)</LibraryPath>
    2.38    </PropertyGroup>
    2.39    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    2.40      <ClCompile>
    2.41 @@ -59,6 +60,7 @@
    2.42        <SDLCheck>true</SDLCheck>
    2.43        <EnablePREfast>false</EnablePREfast>
    2.44        <AdditionalIncludeDirectories>C:\Users\vb\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.45 +	  <CompileAs>Default</CompileAs>
    2.46      </ClCompile>
    2.47      <Link>
    2.48        <SubSystem>Windows</SubSystem>
    2.49 @@ -81,6 +83,7 @@
    2.50        <SDLCheck>false</SDLCheck>
    2.51        <TreatWarningAsError>false</TreatWarningAsError>
    2.52        <AdditionalIncludeDirectories>C:\Users\vb\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.53 +	  <CompileAs>Default</CompileAs>
    2.54      </ClCompile>
    2.55      <Link>
    2.56        <SubSystem>Windows</SubSystem>
     3.1 --- a/src/platform_windows.h	Tue Aug 02 14:02:25 2016 +0200
     3.2 +++ b/src/platform_windows.h	Wed Aug 03 08:33:41 2016 -0700
     3.3 @@ -25,8 +25,10 @@
     3.4  #define strdup(A) _strdup((A))
     3.5  #endif
     3.6  #ifndef snprintf
     3.7 +#if _MSC_VER<1900 // Includes undefined case. This is a check for VS 2015, which throws an error.
     3.8  #define snprintf(...) _snprintf(__VA_ARGS__)
     3.9  #endif
    3.10 +#endif
    3.11  #ifndef strtok_r
    3.12  #define strtok_r(A, B, C) strtok_s((A), (B), (C))
    3.13  #endif