Skip to content

Commit f1e0b90

Browse files
gcielniakgcielniak
committed
2019 VS upgrade
1 parent 1a69967 commit f1e0b90

File tree

5 files changed

+27
-25
lines changed

5 files changed

+27
-25
lines changed

‎OpenCL Tutorials.sln‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.28307.329
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29613.14
45
MinimumVisualStudioVersion = 10.0.40219.1
56
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial 1", "Tutorial 1\Tutorial 1.vcxproj", "{E99F5DFC-113A-4BC3-8253-90A6AC0C9A9D}"
67
EndProject
@@ -43,6 +44,7 @@ Global
4344
{8CB4B79A-8170-44DE-88DC-C73EACB44CB2}.Release|x86.ActiveCfg = Release|Win32
4445
{8CB4B79A-8170-44DE-88DC-C73EACB44CB2}.Release|x86.Build.0 = Release|Win32
4546
{E95D4B5A-1F3F-4A31-931F-7A99CE219124}.Debug|x64.ActiveCfg = Debug|x64
47+
{E95D4B5A-1F3F-4A31-931F-7A99CE219124}.Debug|x64.Build.0 = Debug|x64
4648
{E95D4B5A-1F3F-4A31-931F-7A99CE219124}.Debug|x86.ActiveCfg = Debug|Win32
4749
{E95D4B5A-1F3F-4A31-931F-7A99CE219124}.Debug|x86.Build.0 = Debug|Win32
4850
{E95D4B5A-1F3F-4A31-931F-7A99CE219124}.Release|x64.ActiveCfg = Release|x64

‎Tutorial 1/Tutorial 1.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,32 @@
3131
<PropertyGroup Label="Globals">
3232
<ProjectGuid>{E99F5DFC-113A-4BC3-8253-90A6AC0C9A9D}</ProjectGuid>
3333
<RootNamespace>Tutorial 1</RootNamespace>
34-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
34+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3535
</PropertyGroup>
3636
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3838
<ConfigurationType>Application</ConfigurationType>
3939
<UseDebugLibraries>true</UseDebugLibraries>
40-
<PlatformToolset>v141</PlatformToolset>
40+
<PlatformToolset>v142</PlatformToolset>
4141
<CharacterSet>Unicode</CharacterSet>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<UseDebugLibraries>false</UseDebugLibraries>
46-
<PlatformToolset>v141</PlatformToolset>
46+
<PlatformToolset>v142</PlatformToolset>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5151
<ConfigurationType>Application</ConfigurationType>
5252
<UseDebugLibraries>true</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5757
<ConfigurationType>Application</ConfigurationType>
5858
<UseDebugLibraries>false</UseDebugLibraries>
59-
<PlatformToolset>v141</PlatformToolset>
59+
<PlatformToolset>v142</PlatformToolset>
6060
<CharacterSet>Unicode</CharacterSet>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
</PropertyGroup>

‎Tutorial 2/Tutorial 2.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,32 @@
3131
<PropertyGroup Label="Globals">
3232
<ProjectGuid>{9167FEE5-0E64-4275-B2B2-A3F87F3A5C8F}</ProjectGuid>
3333
<RootNamespace>Tutorial 1</RootNamespace>
34-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
34+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3535
</PropertyGroup>
3636
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3838
<ConfigurationType>Application</ConfigurationType>
3939
<UseDebugLibraries>true</UseDebugLibraries>
40-
<PlatformToolset>v141</PlatformToolset>
40+
<PlatformToolset>v142</PlatformToolset>
4141
<CharacterSet>Unicode</CharacterSet>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<UseDebugLibraries>false</UseDebugLibraries>
46-
<PlatformToolset>v141</PlatformToolset>
46+
<PlatformToolset>v142</PlatformToolset>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5151
<ConfigurationType>Application</ConfigurationType>
5252
<UseDebugLibraries>true</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5757
<ConfigurationType>Application</ConfigurationType>
5858
<UseDebugLibraries>false</UseDebugLibraries>
59-
<PlatformToolset>v141</PlatformToolset>
59+
<PlatformToolset>v142</PlatformToolset>
6060
<CharacterSet>Unicode</CharacterSet>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
</PropertyGroup>

‎Tutorial 3/Tutorial 3.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,32 @@
3131
<PropertyGroup Label="Globals">
3232
<ProjectGuid>{8CB4B79A-8170-44DE-88DC-C73EACB44CB2}</ProjectGuid>
3333
<RootNamespace>Tutorial 1</RootNamespace>
34-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
34+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3535
</PropertyGroup>
3636
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3838
<ConfigurationType>Application</ConfigurationType>
3939
<UseDebugLibraries>true</UseDebugLibraries>
40-
<PlatformToolset>v141</PlatformToolset>
40+
<PlatformToolset>v142</PlatformToolset>
4141
<CharacterSet>Unicode</CharacterSet>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<UseDebugLibraries>false</UseDebugLibraries>
46-
<PlatformToolset>v141</PlatformToolset>
46+
<PlatformToolset>v142</PlatformToolset>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5151
<ConfigurationType>Application</ConfigurationType>
5252
<UseDebugLibraries>true</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5757
<ConfigurationType>Application</ConfigurationType>
5858
<UseDebugLibraries>false</UseDebugLibraries>
59-
<PlatformToolset>v141</PlatformToolset>
59+
<PlatformToolset>v142</PlatformToolset>
6060
<CharacterSet>Unicode</CharacterSet>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
</PropertyGroup>

‎Tutorial 4/Tutorial 4.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,33 @@
2222
<ProjectGuid>{E95D4B5A-1F3F-4A31-931F-7A99CE219124}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>BComputeExamples</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
<ProjectName>Tutorial 4</ProjectName>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v141</PlatformToolset>
32+
<PlatformToolset>v142</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v141</PlatformToolset>
38+
<PlatformToolset>v142</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v141</PlatformToolset>
45+
<PlatformToolset>v142</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v141</PlatformToolset>
51+
<PlatformToolset>v142</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>
@@ -104,13 +104,13 @@
104104
<WarningLevel>Level3</WarningLevel>
105105
<Optimization>Disabled</Optimization>
106106
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107-
<AdditionalIncludeDirectories>C:\local\boost_1_60_0;$(INTELOCLSDKROOT)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107+
<AdditionalIncludeDirectories>$(BOOST_INCLUDEDIR);$(INTELOCLSDKROOT)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
108108
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
109109
</ClCompile>
110110
<Link>
111111
<SubSystem>Console</SubSystem>
112112
<GenerateDebugInformation>true</GenerateDebugInformation>
113-
<AdditionalLibraryDirectories>C:\local\boost_1_60_0\lib64-msvc-14.0;$(INTELOCLSDKROOT)lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
113+
<AdditionalLibraryDirectories>$(BOOST_LIBRARYDIR);$(INTELOCLSDKROOT)lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114114
<AdditionalDependencies>OpenCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
115115
</Link>
116116
</ItemDefinitionGroup>

0 commit comments

Comments
 (0)