Skip to content
This repository was archived by the owner on Jan 11, 2022. It is now read-only.

Commit efcff11

Browse files
authored
Merge pull request #4 from TechSmith/vs2017
Update solution to Visual Studio 2017
2 parents 7ed7389 + 185ddfd commit efcff11

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ ipch/
6767
*.opensdf
6868
*.sdf
6969
*.cachefile
70+
.vs/
7071

7172
# Visual Studio profiler
7273
*.psess

avi20.autopkg

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
configurations {
22
Toolset {
33
key : "PlatformToolset";
4-
choices: { v140 };
4+
choices: { v141 };
55
};
66
}
77

@@ -10,7 +10,7 @@ nuget
1010
nuspec
1111
{
1212
id = avi20;
13-
version: 1.2.0.0;
13+
version: 1.3.0.0;
1414
title: AVI20 Library;
1515
authors: { TechSmith Corporation };
1616
owners: { TechSmith Corporation };
@@ -19,10 +19,10 @@ nuget
1919
iconUrl: "http://www.techsmith.com/favicon.ico";
2020
requireLicenseAcceptance: false;
2121
summary: AVI20 Library;
22-
releaseNotes: "none";
22+
releaseNotes: "Updated to Visual Studio 2017";
2323
description: @"Library for reading and writing AVI 2.0 files (which supports files larger than 4GB) ";
24-
copyright: "Copyright (c) 2015 TechSmith Corporation. All rights reserved.";
25-
tags: { native, tsc, vs2015, cpp, nomfc, techsmith, cross-platform };
24+
copyright: "Copyright (c) 2015-2018 TechSmith Corporation. All rights reserved.";
25+
tags: { native, tsc, vs2017, cpp, nomfc, techsmith, cross-platform };
2626
};
2727

2828
dependencies
@@ -42,7 +42,7 @@ nuget
4242
avi20Include: { #destination = ${d_include}AVI20; include\AVI20\**\*.h };
4343
libpdb: { #destination = ${d_lib}; };
4444

45-
("Win32,x64", "v140", "Debug,Release") =>
45+
("Win32,x64", "v141", "Debug,Release") =>
4646
{
4747
[${0},${1},${2}]
4848
{

avi20.sln

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27703.2042
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avi20", "avi20.vcxproj", "{6E6F3652-DD6E-48DF-80EF-214986694C77}"
77
EndProject
@@ -30,4 +30,7 @@ Global
3030
GlobalSection(SolutionProperties) = preSolution
3131
HideSolutionNode = FALSE
3232
EndGlobalSection
33+
GlobalSection(ExtensibilityGlobals) = postSolution
34+
SolutionGuid = {D1156AB8-8B92-4CA4-85F6-77FAE9539FA9}
35+
EndGlobalSection
3336
EndGlobal

avi20.vcxproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -27,26 +27,26 @@
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>StaticLibrary</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v140</PlatformToolset>
30+
<PlatformToolset>v141</PlatformToolset>
3131
<CharacterSet>Unicode</CharacterSet>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3434
<ConfigurationType>StaticLibrary</ConfigurationType>
3535
<UseDebugLibraries>false</UseDebugLibraries>
36-
<PlatformToolset>v140</PlatformToolset>
36+
<PlatformToolset>v141</PlatformToolset>
3737
<WholeProgramOptimization>true</WholeProgramOptimization>
3838
<CharacterSet>Unicode</CharacterSet>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4141
<ConfigurationType>StaticLibrary</ConfigurationType>
4242
<UseDebugLibraries>true</UseDebugLibraries>
43-
<PlatformToolset>v140</PlatformToolset>
43+
<PlatformToolset>v141</PlatformToolset>
4444
<CharacterSet>Unicode</CharacterSet>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>StaticLibrary</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v140</PlatformToolset>
49+
<PlatformToolset>v141</PlatformToolset>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
5151
<CharacterSet>Unicode</CharacterSet>
5252
</PropertyGroup>
@@ -92,6 +92,7 @@
9292
<AdditionalIncludeDirectories>$(ProjectDir)include</AdditionalIncludeDirectories>
9393
<PreprocessorDefinitions>AVI20_EXPORTS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
95+
<LanguageStandard>stdcpplatest</LanguageStandard>
9596
</ClCompile>
9697
<Link>
9798
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -105,6 +106,7 @@
105106
<AdditionalIncludeDirectories>$(ProjectDir)include</AdditionalIncludeDirectories>
106107
<PreprocessorDefinitions>AVI20_EXPORTS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107108
<ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
109+
<LanguageStandard>stdcpplatest</LanguageStandard>
108110
</ClCompile>
109111
<Link>
110112
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -120,6 +122,7 @@
120122
<AdditionalIncludeDirectories>$(ProjectDir)include</AdditionalIncludeDirectories>
121123
<PreprocessorDefinitions>AVI20_EXPORTS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122124
<ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
125+
<LanguageStandard>stdcpplatest</LanguageStandard>
123126
</ClCompile>
124127
<Link>
125128
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -137,6 +140,7 @@
137140
<AdditionalIncludeDirectories>$(ProjectDir)include</AdditionalIncludeDirectories>
138141
<PreprocessorDefinitions>AVI20_EXPORTS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139142
<ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
143+
<LanguageStandard>stdcpplatest</LanguageStandard>
140144
</ClCompile>
141145
<Link>
142146
<GenerateDebugInformation>true</GenerateDebugInformation>

0 commit comments

Comments
 (0)