diff options
| author | Adam Mitz <mitza@ociweb.com> | 2018-05-21 09:35:42 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2018-05-21 09:35:42 -0500 |
| commit | 0a8d706e3a6fc92d4fdedcbf8b759860ef1c8fa6 (patch) | |
| tree | 90acb48af3277b9e046619b337f48727d2f2f40a | |
| parent | 7c0a53de53e7f1ba88111280d384388f99ba42aa (diff) | |
| parent | d6cc9463fe36c993c6d8a98c453018fa2c90d4cb (diff) | |
| download | MPC-Latest_ACETAO_Minor.tar.gz | |
Merge pull request #52 from mitza-oci/masterACE+TAO-6_5_0Latest_ACETAO_Minor
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | templates/vc10.mpd | 8 | ||||
| -rw-r--r-- | templates/vs2017platforms.mpt | 1 |
3 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,13 @@ +Mon May 21 14:33:24 UTC 2018 Adam Mitz <mitza@objectcomputing.com> + + * templates/vc10.mpd: + + Generate less XML for custom files with no build step. + + * templates/vs2017platforms.mpt: + + Updated default SDK version to match the current update of VS2017. + Wed May 16 14:43:23 UTC 2018 Chad Elliott <elliott_c@ociweb.com> * docs/templates/uvis.txt: diff --git a/templates/vc10.mpd b/templates/vc10.mpd index 3eaf1e5f..00b7bb9b 100644 --- a/templates/vc10.mpd +++ b/templates/vc10.mpd @@ -822,13 +822,7 @@ <%endfor%> </CustomBuild> <%else%> - <None Include="<%custom_type->input_file%>"> -<%foreach(platforms)%> -<%foreach(configurations)%> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'">true</ExcludedFromBuild> -<%endfor%> -<%endfor%> - </None> + <None Include="<%custom_type->input_file%>" /> <%endif%> <%endfor%> </ItemGroup> diff --git a/templates/vs2017platforms.mpt b/templates/vs2017platforms.mpt index aacffd23..79f529ee 100644 --- a/templates/vs2017platforms.mpt +++ b/templates/vs2017platforms.mpt @@ -8,6 +8,7 @@ platforms = Win32 x64 default_platform = Win32 PlatformToolset = v141 +WindowsTargetPlatformVersion = 10.0.16299.0 Win32 { output_subdir = I386 |