From 8a80da4bda4836dec39ced9119d70dbdcc088e2b Mon Sep 17 00:00:00 2001
From: Yasha Jannoo <alledodo@gmail.com>
Date: Mon, 9 Sep 2019 01:02:57 +0100
Subject: Address Magic DXDK build error

Following the advice on https://stackoverflow.com/questions/38174893/syntax-error-identifier-dxgi-rgba-in-file-dxgi1-2-h stating "if you want to mix the old DirectX SDK with the Windows 8.x SDK, you need to invert the traditional include path order.", choose to support the newest DirectX SDK (included in the Win10 SDK) by following it. The advice references  https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009- which we should take into account for later changes.
---
 Magic2/Magic.vcxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Magic2')

diff --git a/Magic2/Magic.vcxproj b/Magic2/Magic.vcxproj
index 0b365fa..6cbc0e6 100644
--- a/Magic2/Magic.vcxproj
+++ b/Magic2/Magic.vcxproj
@@ -172,7 +172,7 @@
     <OutDir>.\Debug\</OutDir>
     <IntDir>.\Debug\</IntDir>
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath)</IncludePath>
+    <IncludePath>..\oggvorbis\include;$(IncludePath);$(DXSDK_DIR)\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|Win32'">
     <OutDir>.\Debug\</OutDir>
@@ -196,7 +196,7 @@
     <OutDir>.\Release\</OutDir>
     <IntDir>.\Release\</IntDir>
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(DXSDK_DIR)\include;$(IncludePath)</IncludePath>
+    <IncludePath>$(IncludePath);$(DXSDK_DIR)\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|Win32'">
     <OutDir>.\Release\</OutDir>
-- 
cgit v1.1