Skip to content

Commit 0498835

Browse files
jimevansjimevans
committed
Updating C++ projects to work with Visual Studio 2017
1 parent 4351727 commit 0498835

10 files changed

+287
-264
lines changed

‎cpp/IEDriverServer.sln

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.16
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb", "..\third_party\cpp\civetweb\civetweb.vcxproj", "{19517B2F-334D-4F39-BEA7-E5D044AD78AF}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb", "..\third_party\cpp\civetweb\civetweb.vcxproj", "{19417464-5B84-45FE-BE6B-7A01D4B8D412}"
77
EndProject
8-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-cpp", "..\third_party\cpp\json-cpp\json-cpp.vcxproj", "{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}"
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-cpp", "..\third_party\cpp\json-cpp\json-cpp.vcxproj", "{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}"
99
EndProject
10-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-server", "webdriver-server\webdriver-server.vcxproj", "{4E509D48-78BF-44FE-84D4-117AFDCD3788}"
10+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-server", "webdriver-server\webdriver-server.vcxproj", "{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}"
1111
EndProject
12-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "iedriver\IEDriver.vcxproj", "{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}"
12+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "iedriver\IEDriver.vcxproj", "{0B34D228-8584-4589-B4BF-96182E86638D}"
1313
EndProject
14-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriverServer", "IEDriverServer\IEDriverServer.vcxproj", "{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}"
14+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriverServer", "iedriverserver\IEDriverServer.vcxproj", "{D419FE07-1F4C-457C-952C-9492854F7C36}"
1515
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,46 +21,46 @@ Global
2121
Release|x86 = Release|x86
2222
EndGlobalSection
2323
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x64.ActiveCfg = Debug|x64
25-
{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x64.Build.0 = Debug|x64
26-
{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x86.ActiveCfg = Debug|Win32
27-
{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x86.Build.0 = Debug|Win32
28-
{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x64.ActiveCfg = Release|x64
29-
{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x64.Build.0 = Release|x64
30-
{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x86.ActiveCfg = Release|Win32
31-
{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x86.Build.0 = Release|Win32
32-
{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x64.ActiveCfg = Debug|x64
33-
{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x64.Build.0 = Debug|x64
34-
{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x86.ActiveCfg = Debug|Win32
35-
{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x86.Build.0 = Debug|Win32
36-
{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x64.ActiveCfg = Release|x64
37-
{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x64.Build.0 = Release|x64
38-
{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x86.ActiveCfg = Release|Win32
39-
{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x86.Build.0 = Release|Win32
40-
{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x64.ActiveCfg = Debug|x64
41-
{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x64.Build.0 = Debug|x64
42-
{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x86.ActiveCfg = Debug|Win32
43-
{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x86.Build.0 = Debug|Win32
44-
{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x64.ActiveCfg = Release|x64
45-
{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x64.Build.0 = Release|x64
46-
{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x86.ActiveCfg = Release|Win32
47-
{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x86.Build.0 = Release|Win32
48-
{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x64.ActiveCfg = Debug|x64
49-
{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x64.Build.0 = Debug|x64
50-
{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x86.ActiveCfg = Debug|Win32
51-
{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x86.Build.0 = Debug|Win32
52-
{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x64.ActiveCfg = Release|x64
53-
{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x64.Build.0 = Release|x64
54-
{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x86.ActiveCfg = Release|Win32
55-
{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x86.Build.0 = Release|Win32
56-
{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x64.ActiveCfg = Debug|x64
57-
{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x64.Build.0 = Debug|x64
58-
{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x86.ActiveCfg = Debug|Win32
59-
{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x86.Build.0 = Debug|Win32
60-
{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x64.ActiveCfg = Release|x64
61-
{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x64.Build.0 = Release|x64
62-
{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x86.ActiveCfg = Release|Win32
63-
{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x86.Build.0 = Release|Win32
24+
{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x64.ActiveCfg = Debug|x64
25+
{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x64.Build.0 = Debug|x64
26+
{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x86.ActiveCfg = Debug|Win32
27+
{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x86.Build.0 = Debug|Win32
28+
{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x64.ActiveCfg = Release|x64
29+
{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x64.Build.0 = Release|x64
30+
{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x86.ActiveCfg = Release|Win32
31+
{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x86.Build.0 = Release|Win32
32+
{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x64.ActiveCfg = Debug|x64
33+
{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x64.Build.0 = Debug|x64
34+
{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x86.ActiveCfg = Debug|Win32
35+
{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x86.Build.0 = Debug|Win32
36+
{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x64.ActiveCfg = Release|x64
37+
{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x64.Build.0 = Release|x64
38+
{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x86.ActiveCfg = Release|Win32
39+
{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x86.Build.0 = Release|Win32
40+
{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x64.ActiveCfg = Debug|x64
41+
{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x64.Build.0 = Debug|x64
42+
{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x86.ActiveCfg = Debug|Win32
43+
{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x86.Build.0 = Debug|Win32
44+
{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x64.ActiveCfg = Release|x64
45+
{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x64.Build.0 = Release|x64
46+
{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x86.ActiveCfg = Release|Win32
47+
{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x86.Build.0 = Release|Win32
48+
{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x64.ActiveCfg = Debug|x64
49+
{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x64.Build.0 = Debug|x64
50+
{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x86.ActiveCfg = Debug|Win32
51+
{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x86.Build.0 = Debug|Win32
52+
{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x64.ActiveCfg = Release|x64
53+
{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x64.Build.0 = Release|x64
54+
{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x86.ActiveCfg = Release|Win32
55+
{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x86.Build.0 = Release|Win32
56+
{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x64.ActiveCfg = Debug|x64
57+
{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x64.Build.0 = Debug|x64
58+
{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x86.ActiveCfg = Debug|Win32
59+
{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x86.Build.0 = Debug|Win32
60+
{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x64.ActiveCfg = Release|x64
61+
{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x64.Build.0 = Release|x64
62+
{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x86.ActiveCfg = Release|Win32
63+
{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x86.Build.0 = Release|Win32
6464
EndGlobalSection
6565
GlobalSection(SolutionProperties) = preSolution
6666
HideSolutionNode = FALSE

‎cpp/iedriver/IEDriver.vcxproj

Lines changed: 17 additions & 16 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>
@@ -19,34 +19,35 @@
1919
</ProjectConfiguration>
2020
</ItemGroup>
2121
<PropertyGroup Label="Globals">
22-
<ProjectGuid>{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}</ProjectGuid>
22+
<VCProjectVersion>15.0</VCProjectVersion>
23+
<ProjectGuid>{0B34D228-8584-4589-B4BF-96182E86638D}</ProjectGuid>
2324
<RootNamespace>IEDriver</RootNamespace>
24-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2829
<ConfigurationType>DynamicLibrary</ConfigurationType>
2930
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v140_xp</PlatformToolset>
31+
<PlatformToolset>v141_xp</PlatformToolset>
3132
<CharacterSet>Unicode</CharacterSet>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3435
<ConfigurationType>DynamicLibrary</ConfigurationType>
3536
<UseDebugLibraries>false</UseDebugLibraries>
36-
<PlatformToolset>v140_xp</PlatformToolset>
37+
<PlatformToolset>v141_xp</PlatformToolset>
3738
<WholeProgramOptimization>true</WholeProgramOptimization>
3839
<CharacterSet>Unicode</CharacterSet>
3940
</PropertyGroup>
4041
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4142
<ConfigurationType>DynamicLibrary</ConfigurationType>
4243
<UseDebugLibraries>true</UseDebugLibraries>
43-
<PlatformToolset>v140_xp</PlatformToolset>
44+
<PlatformToolset>v141_xp</PlatformToolset>
4445
<CharacterSet>Unicode</CharacterSet>
4546
</PropertyGroup>
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4748
<ConfigurationType>DynamicLibrary</ConfigurationType>
4849
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v140_xp</PlatformToolset>
50+
<PlatformToolset>v141_xp</PlatformToolset>
5051
<WholeProgramOptimization>true</WholeProgramOptimization>
5152
<CharacterSet>Unicode</CharacterSet>
5253
</PropertyGroup>
@@ -90,11 +91,11 @@
9091
<Optimization>Disabled</Optimization>
9192
<SDLCheck>false</SDLCheck>
9293
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
94+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
95+
<PrecompiledHeader>Use</PrecompiledHeader>
9396
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
9497
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
95-
<PrecompiledHeader>Use</PrecompiledHeader>
9698
<MinimalRebuild>false</MinimalRebuild>
97-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
9899
</ClCompile>
99100
<Link>
100101
<AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -108,11 +109,11 @@
108109
<Optimization>Disabled</Optimization>
109110
<SDLCheck>false</SDLCheck>
110111
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
113+
<PrecompiledHeader>Use</PrecompiledHeader>
111114
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
112115
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
113-
<PrecompiledHeader>Use</PrecompiledHeader>
114116
<MinimalRebuild>false</MinimalRebuild>
115-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
116117
</ClCompile>
117118
<Link>
118119
<AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -127,11 +128,11 @@
127128
<FunctionLevelLinking>true</FunctionLevelLinking>
128129
<IntrinsicFunctions>true</IntrinsicFunctions>
129130
<SDLCheck>true</SDLCheck>
131+
<PrecompiledHeader>Use</PrecompiledHeader>
130132
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
131134
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
132135
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
133-
<PrecompiledHeader>Use</PrecompiledHeader>
134-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
135136
</ClCompile>
136137
<Link>
137138
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -148,11 +149,11 @@
148149
<FunctionLevelLinking>true</FunctionLevelLinking>
149150
<IntrinsicFunctions>true</IntrinsicFunctions>
150151
<SDLCheck>true</SDLCheck>
152+
<PrecompiledHeader>Use</PrecompiledHeader>
151153
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
152155
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
153156
<AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
154-
<PrecompiledHeader>Use</PrecompiledHeader>
155-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
156157
</ClCompile>
157158
<Link>
158159
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -344,7 +345,7 @@
344345
</ItemGroup>
345346
<ItemGroup>
346347
<ProjectReference Include="..\webdriver-server\webdriver-server.vcxproj">
347-
<Project>{4e509d48-78bf-44fe-84d4-117afdcd3788}</Project>
348+
<Project>{d1b7e5b4-2caf-4c55-89e0-2634038c8472}</Project>
348349
</ProjectReference>
349350
</ItemGroup>
350351
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

0 commit comments

Comments
 (0)