Skip to content

Commit cfe4bce

Browse files
janwilmansjanwilmans
committed
Updated to WTL 10.0.10320, set the target version to non-specific msvc 10.0 and fixed 2 warnings.
1 parent 5b1803b commit cfe4bce

File tree

16 files changed

+22
-21
lines changed

16 files changed

+22
-21
lines changed

‎CobaltFusion/CobaltFusion.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectGuid>{218AB179-4C19-4264-BD55-DF89A9F321CA}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>CobaltFusion</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎CobaltFusionTest/CobaltFusionTest.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectGuid>{30E249B7-F460-4FD3-9C45-58C55AEF7EF6}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>CobaltFusionTest</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎DbgMsgSrc/DbgMsgSrc.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ProjectGuid>{722E0592-E026-4D51-87EC-6ACA85B385F4}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>DbgMsgSrc</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎DebugView++/DebugView++.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{E37BA0C9-8A2F-4F2E-BBF8-839F3429D3A7}</ProjectGuid>
2323
<Keyword>AtlProj</Keyword>
24-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
24+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2525
</PropertyGroup>
2626
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -378,7 +378,7 @@
378378
<Import Project="..\packages\boost_date_time-vc141.1.69.0.0\build\boost_date_time-vc141.targets" Condition="Exists('..\packages\boost_date_time-vc141.1.69.0.0\build\boost_date_time-vc141.targets')" />
379379
<Import Project="..\packages\boost_regex-vc141.1.69.0.0\build\boost_regex-vc141.targets" Condition="Exists('..\packages\boost_regex-vc141.1.69.0.0\build\boost_regex-vc141.targets')" />
380380
<Import Project="..\packages\boost_system-vc141.1.69.0.0\build\boost_system-vc141.targets" Condition="Exists('..\packages\boost_system-vc141.1.69.0.0\build\boost_system-vc141.targets')" />
381-
<Import Project="..\packages\wtl.10.0.10077\build\native\wtl.targets" Condition="Exists('..\packages\wtl.10.0.10077\build\native\wtl.targets')" />
381+
<Import Project="..\packages\wtl.10.0.10320\build\native\wtl.targets" Condition="Exists('..\packages\wtl.10.0.10320\build\native\wtl.targets')" />
382382
</ImportGroup>
383383
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
384384
<PropertyGroup>
@@ -388,6 +388,6 @@
388388
<Error Condition="!Exists('..\packages\boost_date_time-vc141.1.69.0.0\build\boost_date_time-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_date_time-vc141.1.69.0.0\build\boost_date_time-vc141.targets'))" />
389389
<Error Condition="!Exists('..\packages\boost_regex-vc141.1.69.0.0\build\boost_regex-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_regex-vc141.1.69.0.0\build\boost_regex-vc141.targets'))" />
390390
<Error Condition="!Exists('..\packages\boost_system-vc141.1.69.0.0\build\boost_system-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_system-vc141.1.69.0.0\build\boost_system-vc141.targets'))" />
391-
<Error Condition="!Exists('..\packages\wtl.10.0.10077\build\native\wtl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\wtl.10.0.10077\build\native\wtl.targets'))" />
391+
<Error Condition="!Exists('..\packages\wtl.10.0.10320\build\native\wtl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\wtl.10.0.10320\build\native\wtl.targets'))" />
392392
</Target>
393393
</Project>

‎DebugView++/MainFrame.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ BEGIN_MSG_MAP2(CMainFrame)
149149

150150
if (uMsg == EM_REPLACESEL)
151151
{
152-
m_logSources.AddMessage(wParam, "SendMessage", Str(reinterpret_cast<wchar_t*>(lParam)));
152+
m_logSources.AddMessage(static_cast<DWORD>(wParam), "SendMessage", Str(reinterpret_cast<wchar_t*>(lParam)));
153153
}
154154

155155
// forward WM_COMMANDs directly to the active LogView, otherwise TabbedFrame forwards WM_COMMANDs to the Splitter

‎DebugView++/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<package id="boost_date_time-vc141" version="1.69.0.0" targetFramework="native" />
55
<package id="boost_regex-vc141" version="1.69.0.0" targetFramework="native" />
66
<package id="boost_system-vc141" version="1.69.0.0" targetFramework="native" />
7-
<package id="wtl" version="10.0.10077" targetFramework="native" />
7+
<package id="wtl" version="10.0.10320" targetFramework="native" />
88
</packages>

‎DebugView++/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#define VERSION 1,8,0,95
2-
#define VERSION_STR "1.8.0.95"
1+
#define VERSION 1,8,0,102
2+
#define VERSION_STR "1.8.0.102"

‎DebugView++/version.wxi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<?define ProductVersion.Major="1" ?>
44
<?define ProductVersion.Minor="8" ?>
55
<?define ProductVersion.Revision="0" ?>
6-
<?define ProductVersion.Build="95" ?>
7-
<?define ProductVersion="1.8.0.95" ?>
6+
<?define ProductVersion.Build="102" ?>
7+
<?define ProductVersion="1.8.0.102" ?>
88
</Include>

‎DebugView++Lib/DebugView++Lib.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>DebugViewPPLib</RootNamespace>
2525
<ProjectName>DebugView++Lib</ProjectName>
26-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎DebugView++Test/DebugView++Test.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>DebugViewPPTest</RootNamespace>
2525
<ProjectName>DebugView++Test</ProjectName>
26-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

0 commit comments

Comments
 (0)