Skip to content

Commit 1aa958d

Browse files
PKEuSPKEuS
committed
Updated VS solution with VS2015 as default. Added flags /Zc:inline and /Zc:throwingNew.
1 parent b7bac8c commit 1aa958d

3 files changed

Lines changed: 33 additions & 23 deletions

File tree

‎cli/cli.vcxproj‎

Lines changed: 13 additions & 9 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="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug-PCRE|Win32">
55
<Configuration>Debug-PCRE</Configuration>
@@ -43,49 +43,49 @@
4343
<ConfigurationType>Application</ConfigurationType>
4444
<CharacterSet>Unicode</CharacterSet>
4545
<WholeProgramOptimization>false</WholeProgramOptimization>
46-
<PlatformToolset>v120_xp</PlatformToolset>
46+
<PlatformToolset>v140_xp</PlatformToolset>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<CharacterSet>Unicode</CharacterSet>
5151
<WholeProgramOptimization>false</WholeProgramOptimization>
52-
<PlatformToolset>v120_xp</PlatformToolset>
52+
<PlatformToolset>v140_xp</PlatformToolset>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5555
<ConfigurationType>Application</ConfigurationType>
5656
<CharacterSet>Unicode</CharacterSet>
5757
<WholeProgramOptimization>false</WholeProgramOptimization>
58-
<PlatformToolset>v120</PlatformToolset>
58+
<PlatformToolset>v140</PlatformToolset>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'" Label="Configuration">
6161
<ConfigurationType>Application</ConfigurationType>
6262
<CharacterSet>Unicode</CharacterSet>
6363
<WholeProgramOptimization>false</WholeProgramOptimization>
64-
<PlatformToolset>v120</PlatformToolset>
64+
<PlatformToolset>v140</PlatformToolset>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6767
<ConfigurationType>Application</ConfigurationType>
6868
<CharacterSet>Unicode</CharacterSet>
6969
<WholeProgramOptimization>false</WholeProgramOptimization>
70-
<PlatformToolset>v120_xp</PlatformToolset>
70+
<PlatformToolset>v140_xp</PlatformToolset>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="Configuration">
7373
<ConfigurationType>Application</ConfigurationType>
7474
<CharacterSet>Unicode</CharacterSet>
7575
<WholeProgramOptimization>false</WholeProgramOptimization>
76-
<PlatformToolset>v120_xp</PlatformToolset>
76+
<PlatformToolset>v140_xp</PlatformToolset>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7979
<ConfigurationType>Application</ConfigurationType>
8080
<CharacterSet>Unicode</CharacterSet>
8181
<WholeProgramOptimization>false</WholeProgramOptimization>
82-
<PlatformToolset>v120</PlatformToolset>
82+
<PlatformToolset>v140</PlatformToolset>
8383
</PropertyGroup>
8484
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'" Label="Configuration">
8585
<ConfigurationType>Application</ConfigurationType>
8686
<CharacterSet>Unicode</CharacterSet>
8787
<WholeProgramOptimization>false</WholeProgramOptimization>
88-
<PlatformToolset>v120</PlatformToolset>
88+
<PlatformToolset>v140</PlatformToolset>
8989
</PropertyGroup>
9090
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
9191
<ImportGroup Label="ExtensionSettings" />
@@ -259,6 +259,7 @@
259259
<DebugInformationFormat>
260260
</DebugInformationFormat>
261261
<MultiProcessorCompilation>true</MultiProcessorCompilation>
262+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
262263
</ClCompile>
263264
<Link>
264265
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -290,6 +291,7 @@
290291
<DebugInformationFormat>
291292
</DebugInformationFormat>
292293
<MultiProcessorCompilation>true</MultiProcessorCompilation>
294+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
293295
</ClCompile>
294296
<Link>
295297
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -322,6 +324,7 @@
322324
<DebugInformationFormat>
323325
</DebugInformationFormat>
324326
<MultiProcessorCompilation>true</MultiProcessorCompilation>
327+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
325328
</ClCompile>
326329
<Link>
327330
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -353,6 +356,7 @@
353356
<DebugInformationFormat>
354357
</DebugInformationFormat>
355358
<MultiProcessorCompilation>true</MultiProcessorCompilation>
359+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
356360
</ClCompile>
357361
<Link>
358362
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎lib/cppcheck.vcxproj‎

Lines changed: 13 additions & 9 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="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug-PCRE|Win32">
55
<Configuration>Debug-PCRE</Configuration>
@@ -149,49 +149,49 @@
149149
<ConfigurationType>DynamicLibrary</ConfigurationType>
150150
<CharacterSet>Unicode</CharacterSet>
151151
<WholeProgramOptimization>false</WholeProgramOptimization>
152-
<PlatformToolset>v120_xp</PlatformToolset>
152+
<PlatformToolset>v140_xp</PlatformToolset>
153153
</PropertyGroup>
154154
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="Configuration">
155155
<ConfigurationType>DynamicLibrary</ConfigurationType>
156156
<CharacterSet>Unicode</CharacterSet>
157157
<WholeProgramOptimization>false</WholeProgramOptimization>
158-
<PlatformToolset>v120_xp</PlatformToolset>
158+
<PlatformToolset>v140_xp</PlatformToolset>
159159
</PropertyGroup>
160160
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
161161
<ConfigurationType>DynamicLibrary</ConfigurationType>
162162
<CharacterSet>Unicode</CharacterSet>
163163
<WholeProgramOptimization>false</WholeProgramOptimization>
164-
<PlatformToolset>v120</PlatformToolset>
164+
<PlatformToolset>v140</PlatformToolset>
165165
</PropertyGroup>
166166
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'" Label="Configuration">
167167
<ConfigurationType>DynamicLibrary</ConfigurationType>
168168
<CharacterSet>Unicode</CharacterSet>
169169
<WholeProgramOptimization>false</WholeProgramOptimization>
170-
<PlatformToolset>v120</PlatformToolset>
170+
<PlatformToolset>v140</PlatformToolset>
171171
</PropertyGroup>
172172
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
173173
<ConfigurationType>DynamicLibrary</ConfigurationType>
174174
<CharacterSet>Unicode</CharacterSet>
175175
<WholeProgramOptimization>false</WholeProgramOptimization>
176-
<PlatformToolset>v120_xp</PlatformToolset>
176+
<PlatformToolset>v140_xp</PlatformToolset>
177177
</PropertyGroup>
178178
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="Configuration">
179179
<ConfigurationType>DynamicLibrary</ConfigurationType>
180180
<CharacterSet>Unicode</CharacterSet>
181181
<WholeProgramOptimization>false</WholeProgramOptimization>
182-
<PlatformToolset>v120_xp</PlatformToolset>
182+
<PlatformToolset>v140_xp</PlatformToolset>
183183
</PropertyGroup>
184184
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
185185
<ConfigurationType>DynamicLibrary</ConfigurationType>
186186
<CharacterSet>Unicode</CharacterSet>
187187
<WholeProgramOptimization>false</WholeProgramOptimization>
188-
<PlatformToolset>v120</PlatformToolset>
188+
<PlatformToolset>v140</PlatformToolset>
189189
</PropertyGroup>
190190
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'" Label="Configuration">
191191
<ConfigurationType>DynamicLibrary</ConfigurationType>
192192
<CharacterSet>Unicode</CharacterSet>
193193
<WholeProgramOptimization>false</WholeProgramOptimization>
194-
<PlatformToolset>v120</PlatformToolset>
194+
<PlatformToolset>v140</PlatformToolset>
195195
</PropertyGroup>
196196
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
197197
<ImportGroup Label="ExtensionSettings" />
@@ -376,6 +376,7 @@
376376
<PrecompiledHeader>Use</PrecompiledHeader>
377377
<PrecompiledHeaderFile>check.h</PrecompiledHeaderFile>
378378
<ForcedIncludeFiles>check.h</ForcedIncludeFiles>
379+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
379380
</ClCompile>
380381
<Link>
381382
<AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -410,6 +411,7 @@
410411
<PrecompiledHeader>Use</PrecompiledHeader>
411412
<PrecompiledHeaderFile>check.h</PrecompiledHeaderFile>
412413
<ForcedIncludeFiles>check.h</ForcedIncludeFiles>
414+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
413415
</ClCompile>
414416
<Link>
415417
<AdditionalDependencies>pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -445,6 +447,7 @@
445447
<PrecompiledHeader>Use</PrecompiledHeader>
446448
<PrecompiledHeaderFile>check.h</PrecompiledHeaderFile>
447449
<ForcedIncludeFiles>check.h</ForcedIncludeFiles>
450+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
448451
</ClCompile>
449452
<Link>
450453
<AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -478,6 +481,7 @@
478481
<PrecompiledHeader>Use</PrecompiledHeader>
479482
<PrecompiledHeaderFile>check.h</PrecompiledHeaderFile>
480483
<ForcedIncludeFiles>check.h</ForcedIncludeFiles>
484+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
481485
</ClCompile>
482486
<Link>
483487
<AdditionalDependencies>pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎test/testrunner.vcxproj‎

Lines changed: 7 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="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -112,25 +112,25 @@
112112
<ConfigurationType>Application</ConfigurationType>
113113
<CharacterSet>Unicode</CharacterSet>
114114
<WholeProgramOptimization>false</WholeProgramOptimization>
115-
<PlatformToolset>v120_xp</PlatformToolset>
115+
<PlatformToolset>v140_xp</PlatformToolset>
116116
</PropertyGroup>
117117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
118118
<ConfigurationType>Application</ConfigurationType>
119119
<CharacterSet>Unicode</CharacterSet>
120120
<WholeProgramOptimization>false</WholeProgramOptimization>
121-
<PlatformToolset>v120</PlatformToolset>
121+
<PlatformToolset>v140</PlatformToolset>
122122
</PropertyGroup>
123123
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
124124
<ConfigurationType>Application</ConfigurationType>
125125
<CharacterSet>Unicode</CharacterSet>
126126
<WholeProgramOptimization>false</WholeProgramOptimization>
127-
<PlatformToolset>v120_xp</PlatformToolset>
127+
<PlatformToolset>v140_xp</PlatformToolset>
128128
</PropertyGroup>
129129
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
130130
<ConfigurationType>Application</ConfigurationType>
131131
<CharacterSet>Unicode</CharacterSet>
132132
<WholeProgramOptimization>false</WholeProgramOptimization>
133-
<PlatformToolset>v120</PlatformToolset>
133+
<PlatformToolset>v140</PlatformToolset>
134134
</PropertyGroup>
135135
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
136136
<ImportGroup Label="ExtensionSettings" />
@@ -238,6 +238,7 @@
238238
<PrecompiledHeader>Use</PrecompiledHeader>
239239
<PrecompiledHeaderFile>testsuite.h</PrecompiledHeaderFile>
240240
<ForcedIncludeFiles>testsuite.h</ForcedIncludeFiles>
241+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
241242
</ClCompile>
242243
<Link>
243244
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -273,6 +274,7 @@
273274
<PrecompiledHeader>Use</PrecompiledHeader>
274275
<PrecompiledHeaderFile>testsuite.h</PrecompiledHeaderFile>
275276
<ForcedIncludeFiles>testsuite.h</ForcedIncludeFiles>
277+
<AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
276278
</ClCompile>
277279
<Link>
278280
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

0 commit comments

Comments
 (0)