Просмотр исходного кода

Fixed build issue when building with Win7 SDK.

Branimir Karadžić 7 лет назад
Родитель
Сommit
95d0abdeb5

+ 5 - 5
3rdparty/dxsdk/include/d3d11.h

@@ -14400,11 +14400,11 @@ enum D3D11_CREATE_DEVICE_FLAG
 #if !defined( D3D11_IGNORE_SDK_LAYERS ) 
 #include "d3d11sdklayers.h" 
 #endif 
-#include "d3d10_1.h"
-#include "d3d10shader.h" 
-#include "d3d10_1shader.h" 
-#include "d3d10misc.h" 
-#include "d3d10effect.h" 
+// BK - #include "d3d10_1.h"
+// BK - #include "d3d10shader.h"
+// BK - #include "d3d10_1shader.h"
+// BK - #include "d3d10misc.h"
+// BK - #include "d3d10effect.h"
 
 ///////////////////////////////////////////////////////////////////////////
 // D3D11CreateDevice

+ 2 - 2
3rdparty/dxsdk/include/d3d9.h

@@ -2021,8 +2021,8 @@ typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9;
 
 
 /*********************
-/* D3D9Ex interfaces
-/*********************/
+ * D3D9Ex interfaces
+ *********************/
 
 HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**);
 

+ 24 - 0
3rdparty/dxsdk/include/winapifamily.h

@@ -0,0 +1,24 @@
+/**
+ * This file is part of the mingw-w64 runtime package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
+ */
+
+#ifndef _INC_WINAPIFAMILY
+#define _INC_WINAPIFAMILY
+
+#define WINAPI_PARTITION_DESKTOP 0x1
+#define WINAPI_PARTITION_APP     0x2    
+
+#define WINAPI_FAMILY_APP WINAPI_PARTITION_APP
+#define WINAPI_FAMILY_DESKTOP_APP (WINAPI_PARTITION_DESKTOP \
+				   | WINAPI_PARTITION_APP)    
+
+/* WINAPI_FAMILY can be either desktop + App, or App.  */
+#ifndef WINAPI_FAMILY
+#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP
+#endif
+
+#define WINAPI_FAMILY_PARTITION(v) ((WINAPI_FAMILY & v) == v)
+#define WINAPI_FAMILY_ONE_PARTITION(vset, v) ((WINAPI_FAMILY & vset) == v)
+
+#endif