AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-21 12:00:06 +00:00
Code Issues Releases Wiki Activity

Fix initial WIN32 detection

Browse Source
This commit is contained in:
Chuck Walbourn 2021-01-08 13:31:20 -08:00
parent 234eee8a01
commit 237f3d4f48
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DDSTextureLoader/DDSTextureLoader12.h
View File

@ -16,7 +16,7 @@
#pragma once
#if defined(WIN32) || defined(WINAPI_FAMILY)
#if defined(WIN32) || defined(_WIN32)
#include <d3d12.h>
#else
#include <wsl/winadapter.h>

2
DirectXTex/DirectXTex.h
View File

@ -17,7 +17,7 @@
#include <utility>
#include <vector>
#if defined(WIN32) || defined(WINAPI_FAMILY)
#if defined(WIN32) || defined(_WIN32)
#if !defined(__d3d11_h__) && !defined(__d3d11_x_h__) && !defined(__d3d12_h__) && !defined(__d3d12_x_h__) && !defined(__XBOX_D3D12_X__)
#ifdef _GAMING_XBOX_SCARLETT
#include <d3d12_xs.h>

2
DirectXTex/DirectXTexP.h
View File

@ -70,7 +70,7 @@
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#endif
#if defined(WIN32) || defined(WINAPI_FAMILY)
#if defined(WIN32) || defined(_WIN32)
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif