summaryrefslogtreecommitdiffhomepage
path: root/Magic2
diff options
context:
space:
mode:
authorYasha Jannoo <alledodo@gmail.com>2019-09-09 01:02:57 +0100
committerYasha Jannoo <alledodo@gmail.com>2019-09-09 01:02:57 +0100
commit8a80da4bda4836dec39ced9119d70dbdcc088e2b (patch)
tree93361da595e5d1935ced7ee37697d2c3b16087e3 /Magic2
parent60397b084fb1d3544222e7a2c25d4aecd630381d (diff)
downloadstarshatter-8a80da4bda4836dec39ced9119d70dbdcc088e2b.zip
starshatter-8a80da4bda4836dec39ced9119d70dbdcc088e2b.tar.gz
starshatter-8a80da4bda4836dec39ced9119d70dbdcc088e2b.tar.bz2
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.
Diffstat (limited to 'Magic2')
-rw-r--r--Magic2/Magic.vcxproj4
1 files changed, 2 insertions, 2 deletions
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>