From cdc4bd9da2ef9af54f96e38666f5f42217699388 Mon Sep 17 00:00:00 2001 From: Tracy Ward Date: Fri, 4 Oct 2019 08:48:19 -0400 Subject: [PATCH] Replace missing dxguid.lib functionality One thing that did not make it into the move to the Windows SDK is the dxguid.lib library, which defined the IIDs for all of the DirectX interfaces. This replaces that, defining the ones we use. Currently, we only need to define the DirectInput IIDs, so that is all that is here. (backport from master) --- src/CMakeData-os.cmake | 1 + src/archutils/Win32/DirectXGuids.cpp | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/archutils/Win32/DirectXGuids.cpp diff --git a/src/CMakeData-os.cmake b/src/CMakeData-os.cmake index 4da9486e4d..a8116942c0 100644 --- a/src/CMakeData-os.cmake +++ b/src/CMakeData-os.cmake @@ -42,6 +42,7 @@ else() "archutils/Win32/CrashHandlerNetworking.cpp" "archutils/Win32/DebugInfoHunt.cpp" "archutils/Win32/DialogUtil.cpp" + "archutils/Win32/DirectXGuids.cpp" "archutils/Win32/DirectXHelpers.cpp" "archutils/Win32/ErrorStrings.cpp" "archutils/Win32/GetFileInformation.cpp" diff --git a/src/archutils/Win32/DirectXGuids.cpp b/src/archutils/Win32/DirectXGuids.cpp new file mode 100644 index 0000000000..22ae05e658 --- /dev/null +++ b/src/archutils/Win32/DirectXGuids.cpp @@ -0,0 +1,13 @@ +#include "global.h" + +// The purpose of this file is to define the various GUIDs we need, which +// we used to get via dxguid.lib in the DirectX SDK. The DirectX SDK has +// been discontinued and (mostly) rolled into the Windows SDK, but it is +// missing a few features. One of which is dxguid.lib. + +// if you wind up running into other GUIDs you need, add them here + +#define INITGUID + +#define DIRECTINPUT_VERSION 0x0800 +#include