Update for MinGW

Author: walbourn

CMakePresets.json

@@ -147,6 +147,20 @@
         "strategy": "external"
       }
     },
+    {
+      "name": "MinGW32",
+      "hidden": true,
+      "environment": {
+        "PATH": "$penv{PATH};c:/mingw32/bin;c:/mingw32/libexec/gcc/i686-w64-mingw32/12.2.0"
+      }
+    },
+    {
+      "name": "MinGW64",
+      "hidden": true,
+      "environment": {
+        "PATH": "$penv{PATH};c:/mingw64/bin;c:/mingw64/libexec/gcc/x86_64-w64-mingw32/12.2.0"
+      }
+    },
     {
       "name": "Intel",
       "hidden": true,
@@ -186,7 +200,15 @@
     { "name": "x86-Debug-Clang"    , "description": "Clang/LLVM for x86 (Debug) - SSE/SSE2", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86" ] },
     { "name": "x86-Release-Clang"  , "description": "Clang/LLVM for x86 (Release) - SSE/SSE2", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86" ] },
     { "name": "arm64-Debug-Clang"  , "description": "Clang/LLVM for AArch64 (Debug) - ARM-NEON", "inherits": [ "base", "ARM64", "Debug", "Clang", "Clang-AArch64" ] },
-    { "name": "arm64-Release-Clang", "description": "Clang/LLVM for AArch64 (Release) - ARM-NEON", "inherits": [ "base", "ARM64", "Release", "Clang", "Clang-AArch64" ] }
+    { "name": "arm64-Release-Clang", "description": "Clang/LLVM for AArch64 (Release) - ARM-NEON", "inherits": [ "base", "ARM64", "Release", "Clang", "Clang-AArch64" ] },
+
+    { "name": "x64-Debug-MinGW"     , "description": "MinG-W64 (Debug) - SSE/SSE2", "inherits": [ "base", "x64", "Debug", "GNUC", "MinGW64" ] },
+    { "name": "x64-Release-MinGW"   , "description": "MinG-W64 (Release) - SSE/SSE2", "inherits": [ "base", "x64", "Release", "GNUC", "MinGW64" ] },
+    { "name": "x86-Debug-MinGW"     , "description": "MinG-W32 (Debug) - SSE/SSE2", "inherits": [ "base", "x86", "Debug", "GNUC", "MinGW32" ] },
+    { "name": "x86-Release-MinGW"   , "description": "MinG-W32 (Release) - SSE/SSE2", "inherits": [ "base", "x86", "Release", "GNUC", "MinGW32" ] },
+
+    { "name": "x64-Debug-Linux"     , "description": "WSL x64 (Debug) - SSE/SSE2", "inherits": [ "base", "x64", "Debug" ] },
+    { "name": "x64-Release-Linux"   , "description": "WSL x64 (Release) - SSE/SSE2", "inherits": [ "base", "x64", "Release" ] }
   ],
   "testPresets": [
     { "name": "x64-Debug"      , "configurePreset": "x64-Debug" },

SHMath/CMakeLists.txt

@@ -71,6 +71,8 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 
 target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_11)
 
+target_link_libraries(${PROJECT_NAME} PRIVATE DirectXMath)
+
 if(MINGW)
     find_package(directx-headers CONFIG REQUIRED)
     target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers)

SHMath/DirectXSH.h

@@ -11,7 +11,7 @@
 
 #define DIRECTX_SHMATH_VERSION 106
 
-#include <DirectXMath.h>
+#include "DirectXMath.h"
 
 namespace DirectX
 {

SHMath/DirectXSHD3D12.cpp

@@ -16,6 +16,10 @@
 // C5039 pointer or reference to potentially throwing function passed to extern C function under - EHc
 #endif
 
+#ifdef __MINGW32__
+#include <unknwn.h>
+#endif
+
 #ifdef USING_DIRECTX_HEADERS
 #include <directx/d3d12.h>
 #else

XDSP/XDSP.h

@@ -17,7 +17,7 @@
 #pragma once
 
 #include <cassert>
-#include <DirectXMath.h>
+#include "DirectXMath.h"
 
 #include <cstdint>
 #include <cstring>