[Bf-blender-cvs] [3ac37fb552a] soc-2019-openxr: Fix compile errors with older MSVC/Win-SDK versions
Julian Eisel
noreply at git.blender.org
Thu Jun 13 18:23:57 CEST 2019
Commit: 3ac37fb552a511060a05df3c6d34da406d82ae60
Author: Julian Eisel
Date: Thu Jun 13 18:21:16 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB3ac37fb552a511060a05df3c6d34da406d82ae60
Fix compile errors with older MSVC/Win-SDK versions
Reported by @LazyDodo, thanks!
===================================================================
M source/blender/windowmanager/xr/intern/wm_xr_event.c
M source/blender/windowmanager/xr/intern/wm_xr_openxr_includes.h
===================================================================
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_event.c b/source/blender/windowmanager/xr/intern/wm_xr_event.c
index 0a730feaa17..876fc6ff4da 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_event.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_event.c
@@ -18,6 +18,8 @@
* \ingroup wm
*/
+#include <stdio.h>
+
#include "BLI_compiler_attrs.h"
#include "BLI_utildefines.h"
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_openxr_includes.h b/source/blender/windowmanager/xr/intern/wm_xr_openxr_includes.h
index 6e008cc1eb3..9b306e96378 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_openxr_includes.h
+++ b/source/blender/windowmanager/xr/intern/wm_xr_openxr_includes.h
@@ -16,6 +16,10 @@
/** \file
* \ingroup wm
+ *
+ * \note This is taken mostly from the OpenXR SDK, but with modified D3D versions (e.g. d3d11_4.h
+ * -> d3d11.h). Take care for that when updating, we don't want to require newest Win SDKs to be
+ * installed.
*/
#ifndef __WM_XR_SYSTEM_INCLUDES_H__
@@ -33,7 +37,7 @@
# include <d3d10_1.h>
#endif
#ifdef XR_USE_GRAPHICS_API_D3D11
-# include <d3d11_4.h>
+# include <d3d11.h>
#endif
#ifdef XR_USE_GRAPHICS_API_D3D12
# include <d3d12.h>
More information about the Bf-blender-cvs
mailing list