зеркало из https://github.com/microsoft/DXUT.git
Updated for Windows 10 Anniversary Update SDK
This commit is contained in:
Chuck Walbourn
Родитель
14595e4db3
Коммит
a3041e4432
|
|
@ -138,7 +138,7 @@
|
|||
((DWORD)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff)))
|
||||
#endif
|
||||
|
||||
#define DXUT_VERSION 1112
|
||||
#define DXUT_VERSION 1113
|
||||
|
||||
//--------------------------------------------------------------------------------------
|
||||
// Structs
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<ProjectGuid>{85344B7F-5AA0-4e12-A065-D1333D11F6CA}</ProjectGuid>
|
||||
<RootNamespace>DXUT</RootNamespace>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<ProjectGuid>{85344B7F-5AA0-4e12-A065-D1333D11F6CA}</ProjectGuid>
|
||||
<RootNamespace>DXUT</RootNamespace>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2015
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUT", "Core\DXUT_DirectXTK_2015_Win10.vcxproj", "{85344B7F-5AA0-4E12-A065-D1333D11F6CA}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E} = {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}
|
||||
|
|
@ -11,7 +13,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUTOpt", "Optional\DXUTOpt
|
|||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E} = {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2015", "..\DirectXTK\DirectXTK_Desktop_2015.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2015_Win10", "..\directxtk\DirectXTK_Desktop_2015_Win10.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
|
@ -61,22 +63,16 @@ Global
|
|||
{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}.Release|x64.Deploy.0 = Release|x64
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Win32.Deploy.0 = Debug|Win32
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.Build.0 = Debug|x64
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.Deploy.0 = Debug|x64
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Profile|Win32.ActiveCfg = Release|Win32
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Profile|Win32.Build.0 = Release|Win32
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Profile|Win32.Deploy.0 = Release|Win32
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Profile|x64.ActiveCfg = Release|x64
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Profile|x64.Build.0 = Release|x64
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Profile|x64.Deploy.0 = Release|x64
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Win32.Build.0 = Release|Win32
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Win32.Deploy.0 = Release|Win32
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64
|
||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Deploy.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<ProjectGuid>{61B333C2-C4F7-4cc1-A9BF-83F6D95588EB}</ProjectGuid>
|
||||
<RootNamespace>DXUTOpt</RootNamespace>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<ProjectGuid>{61B333C2-C4F7-4cc1-A9BF-83F6D95588EB}</ProjectGuid>
|
||||
<RootNamespace>DXUTOpt</RootNamespace>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ DXUT FOR DIRECT3D 11
|
|||
|
||||
Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
|
||||
April 26, 2016
|
||||
August 2, 2016
|
||||
|
||||
DXUT is a "GLUT"-like framework for Direct3D 11.x Win32 desktop applications; primarily
|
||||
samples, demos, and prototypes.
|
||||
|
|
@ -56,6 +56,9 @@ This version of DXUT only supports Direct3D 11, and therefore is not compatible
|
|||
RELEASE HISTORY
|
||||
---------------
|
||||
|
||||
August 2, 2016 (11.13)
|
||||
Updated for VS 2015 Update 3 and Windows 10 SDK (14393)
|
||||
|
||||
April 26, 2016 (11.12)
|
||||
Updated DDSTextureLoader, WICTextureLoader, and ScreenGrab
|
||||
Retired VS 2012 projects and obsolete adapter code
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<ExecutablePath>$(ProgramFiles)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
|
||||
<IncludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\winrt;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(ProgramFiles)\Windows Kits\10\lib\10.0.10586.0\um\x64;$(LibraryPath)</LibraryPath>
|
||||
<ExcludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\winrt;$(ExcludePath)</ExcludePath>
|
||||
<IncludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\winrt;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(ProgramFiles)\Windows Kits\10\lib\10.0.14393.0\um\x64;$(LibraryPath)</LibraryPath>
|
||||
<ExcludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\winrt;$(ExcludePath)</ExcludePath>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup />
|
||||
</Project>
|
||||
|
|
@ -4,9 +4,9 @@
|
|||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<ExecutablePath>$(ProgramFiles)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
|
||||
<IncludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\winrt;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(ProgramFiles)\Windows Kits\10\lib\10.0.10586.0\um\x86;$(LibraryPath)</LibraryPath>
|
||||
<ExcludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\winrt;$(ExcludePath)</ExcludePath>
|
||||
<IncludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\winrt;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(ProgramFiles)\Windows Kits\10\lib\10.0.14393.0\um\x86;$(LibraryPath)</LibraryPath>
|
||||
<ExcludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.14393.0\winrt;$(ExcludePath)</ExcludePath>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup />
|
||||
</Project>
|
||||
Загрузка…
Ссылка в новой задаче