[Bf-blender-cvs] [3dcc7c73e2d] master: MSVC: Fix build error with the 8.1 SDK

Ray Molenkamp noreply at git.blender.org
Mon Jul 13 16:38:38 CEST 2020


Commit: 3dcc7c73e2d97c931136490238498520572d4ce0
Author: Ray Molenkamp
Date:   Mon Jul 13 08:38:31 2020 -0600
Branches: master
https://developer.blender.org/rB3dcc7c73e2d97c931136490238498520572d4ce0

MSVC: Fix build error with the 8.1 SDK

shobjidl_core.h only exists in the windows 10 SDK in the 8.1
SDK ShObjIdl.h will have the definitions we need, which still
exists in the 10 SDK and implicitly includes shobjidl_core.h.

so ShObjIdl.h will work on both SDK versions.

===================================================================

M	source/blender/blenlib/intern/storage.c

===================================================================

diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index e3a2b6b4992..5b617c840b5 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -55,7 +55,7 @@
 #  include "utfconv.h"
 #  include <direct.h>
 #  include <io.h>
-#  include <shobjidl_core.h>
+#  include <ShObjIdl.h>
 #  include <stdbool.h>
 #else
 #  include <pwd.h>



More information about the Bf-blender-cvs mailing list