Skip to content

Commit a0cc71b

Browse files
committed
Add version information to Desktop dll (v120 and v140) via a resource file
1 parent 8f35cf4 commit a0cc71b

File tree

4 files changed

+24
-0
lines changed

4 files changed

+24
-0
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//{{NO_DEPENDENCIES}}
2+
// Microsoft Visual C++ generated include file.
3+
// Used by Resource.rc
4+
5+
// Next default values for new objects
6+
//
7+
#ifdef APSTUDIO_INVOKED
8+
#ifndef APSTUDIO_READONLY_SYMBOLS
9+
#define _APS_NEXT_RESOURCE_VALUE 101
10+
#define _APS_NEXT_COMMAND_VALUE 40001
11+
#define _APS_NEXT_CONTROL_VALUE 1001
12+
#define _APS_NEXT_SYMED_VALUE 101
13+
#endif
14+
#endif

Release/include/cpprest/version.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,10 @@
1919
#define CPPREST_VERSION_MINOR 6
2020
#define CPPREST_VERSION_MAJOR 2
2121

22+
#if (defined(_MSC_VER) && (_MSC_VER >= 1900))
23+
#define CPPREST_TOOLSET 140
24+
#elif (defined(_MSC_VER) && (_MSC_VER >= 1800))
25+
#define CPPREST_TOOLSET 120
26+
#endif
27+
2228
#define CPPREST_VERSION (CPPREST_VERSION_MAJOR*100000+CPPREST_VERSION_MINOR*100+CPPREST_VERSION_REVISION)

Release/src/build/common.vcxitems

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_server.h" />
5757
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_server_api.h" />
5858
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\nosal.h" />
59+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\resource.h" />
5960
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\SafeInt3.hpp" />
6061
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\uri_parser.h" />
6162
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\web_utilities.h" />
@@ -84,6 +85,9 @@
8485
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxtasks.h" />
8586
<ClInclude Include="$(MSBuildThisFileDirectory)..\pch\stdafx.h" />
8687
</ItemGroup>
88+
<ItemGroup>
89+
<ResourceCompile Include="$(MSBuildThisFileDirectory)..\utilities\Resource.rc" />
90+
</ItemGroup>
8791
<ItemGroup>
8892
<None Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_constants.dat" />
8993
</ItemGroup>

Release/src/utilities/Resource.rc

5.75 KB
Binary file not shown.

0 commit comments

Comments
 (0)