Skip to content
This repository has been archived by the owner on Dec 2, 2024. It is now read-only.

Commit

Permalink
April 26, 2019
Browse files Browse the repository at this point in the history
  • Loading branch information
walbourn committed Apr 26, 2019
1 parent 596c276 commit 8626270
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .nuget/fx11_desktop_2015.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<metadata minClientVersion="2.8.6">
<id>fx11_desktop_2015</id>
<version>0.0.0-SpecifyVersionOnCommandline</version>
<title>Effects for Direct3D 11 (VS 2015/VS 2017 Win32)</title>
<title>Effects for Direct3D 11 (VS 2015/2017/2019 Win32)</title>
<authors>Microsoft</authors>
<owners>microsoft,directxtk</owners>
<summary>Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.</summary>
<description>This version is for Win32 desktop applications using Visual Studio 2015 Update 3 or Visual Studio 2017.</description>
<releaseNotes>Matches the July 12, 2018 release on GitHub.</releaseNotes>
<description>This version is for Win32 desktop applications using Visual Studio 2015 Update 3, Visual Studio 2017, or Visual Studio 2019.</description>
<releaseNotes>Matches the April 26, 2019 release on GitHub.</releaseNotes>
<projectUrl>http://go.microsoft.com/fwlink/p/?LinkId=271568</projectUrl>
<iconUrl>https://github.com/Microsoft/FX11/wiki/X_jpg.jpg</iconUrl>
<licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
Expand Down
20 changes: 13 additions & 7 deletions ReadMe.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@ EFFECTS FOR DIRECT3D 11 (FX11)

Copyright (c) Microsoft Corporation. All rights reserved.

July 12, 2018
April 26, 2019

Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render
state, and runtime variables together.

This code is designed to build with Visual Studio 2015 Update 3 or Visual Studio 2017.
It is recommended that you make use of VS 2015 Update 3, Windows Tools 1.4.1, and the
Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.7 update) or later with the
Windows 10 April 2018 Update SDK (17134).
This code is designed to build with Visual Studio 2015 Update 3, Visual Studio 2017,
or Visual Studio 2019. It is recommended that you make use of VS 2015 Update 3,
Windows Tools 1.4.1, and the Windows 10 Anniversary Update SDK (14393) -or-
VS 2017 (15.9 update) / VS 2019 with the Windows 10 October 2018 Update SDK (17763).

These components are designed to work without requiring any content from the DirectX SDK. For details,
see "Where is the DirectX SDK?" <http://msdn.microsoft.com/en-us/library/ee663275.aspx>.
These components are designed to work without requiring any content from the
legacy DirectX SDK. For details, see "Where is the DirectX SDK?"
<https://aka.ms/dxsdk>.

All content and source code for this package are subject to the terms of the MIT License.
<http://opensource.org/licenses/MIT>.
Expand Down Expand Up @@ -62,6 +63,11 @@ in a future update.
RELEASE HISTORY
---------------

April 26, 2019 (11.26)
Added VS 2019 desktop projects
VS 2017 updated for Windows 10 October 2018 Update SDK (17763)
Minor code cleanup

July 12, 2018 (11.25)
Added D3DX11DebugMute function
Minor project and code cleanup
Expand Down
3 changes: 1 addition & 2 deletions inc/d3dx11effect.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@

#pragma once

#define D3DX11_EFFECTS_VERSION 1125
#define D3DX11_EFFECTS_VERSION 1126

#if defined(_XBOX_ONE) && defined(_TITLE)
#include <d3d11_x.h>
#define DCOMMON_H_INCLUDED
#define NO_D3D11_DEBUG_NAME
#else
#include <d3d11_1.h>
Expand Down

0 comments on commit 8626270

Please sign in to comment.