Skip to content

Commit eb5a620

Browse files
blue3kblue3k
committed
Support VS2017
1 parent 10e7333 commit eb5a620

10 files changed

Lines changed: 91 additions & 49 deletions

File tree

‎NppPlugin/project/NppPlugin.vcxproj‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,60 +30,67 @@
3030
<ProjectGuid>{69CC76EB-0183-4622-929C-02E860A66A23}</ProjectGuid>
3131
<RootNamespace>NppPlugin</RootNamespace>
3232
<Keyword>Win32Proj</Keyword>
33+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
3334
</PropertyGroup>
3435
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3637
<ConfigurationType>StaticLibrary</ConfigurationType>
3738
<CharacterSet>Unicode</CharacterSet>
3839
<WholeProgramOptimization>true</WholeProgramOptimization>
39-
<PlatformToolset>v140_xp</PlatformToolset>
40+
<PlatformToolset>v141</PlatformToolset>
4041
</PropertyGroup>
4142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4243
<ConfigurationType>StaticLibrary</ConfigurationType>
4344
<CharacterSet>Unicode</CharacterSet>
4445
<WholeProgramOptimization>true</WholeProgramOptimization>
45-
<PlatformToolset>v140_xp</PlatformToolset>
46+
<PlatformToolset>v141</PlatformToolset>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4849
<ConfigurationType>StaticLibrary</ConfigurationType>
4950
<CharacterSet>Unicode</CharacterSet>
50-
<PlatformToolset>v140_xp</PlatformToolset>
51+
<PlatformToolset>v141</PlatformToolset>
5152
</PropertyGroup>
5253
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5354
<ConfigurationType>StaticLibrary</ConfigurationType>
5455
<CharacterSet>Unicode</CharacterSet>
55-
<PlatformToolset>v140_xp</PlatformToolset>
56+
<PlatformToolset>v141</PlatformToolset>
5657
</PropertyGroup>
5758
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
5859
<ConfigurationType>StaticLibrary</ConfigurationType>
5960
<CharacterSet>Unicode</CharacterSet>
60-
<PlatformToolset>v140_xp</PlatformToolset>
61+
<PlatformToolset>v141</PlatformToolset>
6162
</PropertyGroup>
6263
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="Configuration">
6364
<ConfigurationType>StaticLibrary</ConfigurationType>
6465
<CharacterSet>Unicode</CharacterSet>
65-
<PlatformToolset>v140_xp</PlatformToolset>
66+
<PlatformToolset>v141</PlatformToolset>
6667
</PropertyGroup>
6768
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6869
<ImportGroup Label="ExtensionSettings">
6970
</ImportGroup>
7071
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
7172
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
73+
<Import Project="..\..\VSProp\PythonScriptCompile.props" />
7274
</ImportGroup>
7375
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
7476
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
77+
<Import Project="..\..\VSProp\PythonScriptCompile.props" />
7578
</ImportGroup>
7679
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
7780
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
81+
<Import Project="..\..\VSProp\PythonScriptCompile.props" />
7882
</ImportGroup>
7983
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
8084
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
85+
<Import Project="..\..\VSProp\PythonScriptCompile.props" />
8186
</ImportGroup>
8287
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="PropertySheets">
8388
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
89+
<Import Project="..\..\VSProp\PythonScriptCompile.props" />
8490
</ImportGroup>
8591
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="PropertySheets">
8692
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
93+
<Import Project="..\..\VSProp\PythonScriptCompile.props" />
8794
</ImportGroup>
8895
<PropertyGroup Label="UserMacros" />
8996
<PropertyGroup>

‎PythonScript.Tests/PythonScript.Tests.vcxproj‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,72 +30,79 @@
3030
<ProjectGuid>{141C090A-DF76-456E-8B54-1E2C9E5AE75A}</ProjectGuid>
3131
<Keyword>Win32Proj</Keyword>
3232
<RootNamespace>PythonScriptTests</RootNamespace>
33+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
3334
</PropertyGroup>
3435
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3637
<ConfigurationType>Application</ConfigurationType>
3738
<UseDebugLibraries>true</UseDebugLibraries>
3839
<CharacterSet>Unicode</CharacterSet>
39-
<PlatformToolset>v140_xp</PlatformToolset>
40+
<PlatformToolset>v141</PlatformToolset>
4041
</PropertyGroup>
4142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4243
<ConfigurationType>Application</ConfigurationType>
4344
<UseDebugLibraries>true</UseDebugLibraries>
4445
<CharacterSet>Unicode</CharacterSet>
45-
<PlatformToolset>v140_xp</PlatformToolset>
46+
<PlatformToolset>v141</PlatformToolset>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
4849
<ConfigurationType>Application</ConfigurationType>
4950
<UseDebugLibraries>true</UseDebugLibraries>
5051
<CharacterSet>Unicode</CharacterSet>
51-
<PlatformToolset>v140_xp</PlatformToolset>
52+
<PlatformToolset>v141</PlatformToolset>
5253
</PropertyGroup>
5354
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="Configuration">
5455
<ConfigurationType>Application</ConfigurationType>
5556
<UseDebugLibraries>true</UseDebugLibraries>
5657
<CharacterSet>Unicode</CharacterSet>
57-
<PlatformToolset>v140_xp</PlatformToolset>
58+
<PlatformToolset>v141</PlatformToolset>
5859
</PropertyGroup>
5960
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6061
<ConfigurationType>Application</ConfigurationType>
6162
<UseDebugLibraries>false</UseDebugLibraries>
6263
<WholeProgramOptimization>true</WholeProgramOptimization>
6364
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v140_xp</PlatformToolset>
65+
<PlatformToolset>v141</PlatformToolset>
6566
</PropertyGroup>
6667
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6768
<ConfigurationType>Application</ConfigurationType>
6869
<UseDebugLibraries>false</UseDebugLibraries>
6970
<WholeProgramOptimization>true</WholeProgramOptimization>
7071
<CharacterSet>Unicode</CharacterSet>
71-
<PlatformToolset>v140_xp</PlatformToolset>
72+
<PlatformToolset>v141</PlatformToolset>
7273
</PropertyGroup>
7374
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7475
<ImportGroup Label="ExtensionSettings">
7576
</ImportGroup>
7677
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7778
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7879
<Import Project="..\PythonScript\project\PythonSettings.props" />
80+
<Import Project="..\VSProp\PythonScriptCompile.props" />
7981
</ImportGroup>
8082
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
8183
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
8284
<Import Project="..\PythonScript\project\PythonSettings.props" />
85+
<Import Project="..\VSProp\PythonScriptCompile.props" />
8386
</ImportGroup>
8487
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="PropertySheets">
8588
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
8689
<Import Project="..\PythonScript\project\PythonSettings.props" />
90+
<Import Project="..\VSProp\PythonScriptCompile.props" />
8791
</ImportGroup>
8892
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="PropertySheets">
8993
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
9094
<Import Project="..\PythonScript\project\PythonSettings.props" />
95+
<Import Project="..\VSProp\PythonScriptCompile.props" />
9196
</ImportGroup>
9297
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9398
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
9499
<Import Project="..\PythonScript\project\PythonSettings.props" />
100+
<Import Project="..\VSProp\PythonScriptCompile.props" />
95101
</ImportGroup>
96102
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
97103
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
98104
<Import Project="..\PythonScript\project\PythonSettings.props" />
105+
<Import Project="..\VSProp\PythonScriptCompile.props" />
99106
</ImportGroup>
100107
<PropertyGroup Label="UserMacros" />
101108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -143,8 +150,6 @@
143150
<SubSystem>Console</SubSystem>
144151
<GenerateDebugInformation>true</GenerateDebugInformation>
145152
<AdditionalDependencies>bin\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
146-
<AdditionalLibraryDirectories>
147-
</AdditionalLibraryDirectories>
148153
</Link>
149154
<PostBuildEvent>
150155
<Command>$(TargetDir)$(TargetFileName)</Command>
@@ -165,8 +170,6 @@
165170
<SubSystem>Console</SubSystem>
166171
<GenerateDebugInformation>true</GenerateDebugInformation>
167172
<AdditionalDependencies>bin64\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
168-
<AdditionalLibraryDirectories>
169-
</AdditionalLibraryDirectories>
170173
</Link>
171174
<PostBuildEvent>
172175
<Command>$(TargetDir)$(TargetFileName)</Command>
@@ -187,8 +190,6 @@
187190
<SubSystem>Console</SubSystem>
188191
<GenerateDebugInformation>true</GenerateDebugInformation>
189192
<AdditionalDependencies>bin\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
190-
<AdditionalLibraryDirectories>
191-
</AdditionalLibraryDirectories>
192193
</Link>
193194
<PostBuildEvent>
194195
<Command>$(TargetDir)$(TargetFileName)</Command>
@@ -209,8 +210,6 @@
209210
<SubSystem>Console</SubSystem>
210211
<GenerateDebugInformation>true</GenerateDebugInformation>
211212
<AdditionalDependencies>bin64\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
212-
<AdditionalLibraryDirectories>
213-
</AdditionalLibraryDirectories>
214213
</Link>
215214
<PostBuildEvent>
216215
<Command>$(TargetDir)$(TargetFileName)</Command>
@@ -257,7 +256,9 @@
257256
</Link>
258257
</ItemDefinitionGroup>
259258
<ItemGroup>
260-
<None Include="packages.config" />
259+
<None Include="packages.config">
260+
<SubType>Designer</SubType>
261+
</None>
261262
<None Include="ReadMe.txt" />
262263
</ItemGroup>
263264
<ItemGroup>

‎PythonScript.Tests/PythonScript.Tests.vcxproj.filters‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
</ItemGroup>
2323
<ItemGroup>
2424
<None Include="ReadMe.txt" />
25+
<None Include="packages.config" />
2526
</ItemGroup>
2627
<ItemGroup>
2728
<ClInclude Include="stdafx.h">

‎PythonScript.Tests/gtest.proj/gtest.vcxproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,46 @@
3030
<ProjectGuid>{2DDE822D-E7AC-4650-B875-D33FADC0EED9}</ProjectGuid>
3131
<Keyword>Win32Proj</Keyword>
3232
<RootNamespace>gtestvcxproj</RootNamespace>
33+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
3334
</PropertyGroup>
3435
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3637
<ConfigurationType>StaticLibrary</ConfigurationType>
3738
<UseDebugLibraries>true</UseDebugLibraries>
3839
<CharacterSet>Unicode</CharacterSet>
39-
<PlatformToolset>v140_xp</PlatformToolset>
40+
<PlatformToolset>v141</PlatformToolset>
4041
</PropertyGroup>
4142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4243
<ConfigurationType>StaticLibrary</ConfigurationType>
4344
<UseDebugLibraries>true</UseDebugLibraries>
4445
<CharacterSet>Unicode</CharacterSet>
45-
<PlatformToolset>v140_xp</PlatformToolset>
46+
<PlatformToolset>v141</PlatformToolset>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
4849
<ConfigurationType>StaticLibrary</ConfigurationType>
4950
<UseDebugLibraries>true</UseDebugLibraries>
5051
<CharacterSet>Unicode</CharacterSet>
51-
<PlatformToolset>v140_xp</PlatformToolset>
52+
<PlatformToolset>v141</PlatformToolset>
5253
</PropertyGroup>
5354
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="Configuration">
5455
<ConfigurationType>StaticLibrary</ConfigurationType>
5556
<UseDebugLibraries>true</UseDebugLibraries>
5657
<CharacterSet>Unicode</CharacterSet>
57-
<PlatformToolset>v140_xp</PlatformToolset>
58+
<PlatformToolset>v141</PlatformToolset>
5859
</PropertyGroup>
5960
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6061
<ConfigurationType>StaticLibrary</ConfigurationType>
6162
<UseDebugLibraries>false</UseDebugLibraries>
6263
<WholeProgramOptimization>true</WholeProgramOptimization>
6364
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v140_xp</PlatformToolset>
65+
<PlatformToolset>v141</PlatformToolset>
6566
</PropertyGroup>
6667
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6768
<ConfigurationType>StaticLibrary</ConfigurationType>
6869
<UseDebugLibraries>false</UseDebugLibraries>
6970
<WholeProgramOptimization>true</WholeProgramOptimization>
7071
<CharacterSet>Unicode</CharacterSet>
71-
<PlatformToolset>v140_xp</PlatformToolset>
72+
<PlatformToolset>v141</PlatformToolset>
7273
</PropertyGroup>
7374
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7475
<ImportGroup Label="ExtensionSettings">

‎PythonScript.Tests/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.66.0.0" targetFramework="native" />
4-
<package id="boost_python-vc140" version="1.66.0.0" targetFramework="native" />
5-
<package id="boost_regex-vc140" version="1.66.0.0" targetFramework="native" />
4+
<package id="boost_python-vc141" version="1.66.0.0" targetFramework="native" />
5+
<package id="boost_regex-vc141" version="1.66.0.0" targetFramework="native" />
66
</packages>

0 commit comments

Comments
 (0)