Fix unit tests on Windows

chances · Sep 28, 2023 · e608892 · e608892
1 parent faffb51
commit e608892
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/dub.json b/dub.json
@@ -24,8 +24,8 @@
 	},
   "systemDependencies-linux": "vulkan >= 1.1.0, patchelf",
   "systemDependencies-osx": "metal >= 2",
-  "systemDependencies-windows": "DirectX >= 11",
-  "preGenerateCommands-posix": [
+  "systemDependencies-windows": "vulkan >= 1.1.0 or DirectX >= 11",
+  "preGenerateCommands": [
     "make wgpu"
   ],
   "dflags": [
@@ -34,16 +34,10 @@
   ],
   "configurations": [
     {
-      "name": "library",
-      "lflags-posix": [
-        "-L$PACKAGE_DIR/lib"
-      ]
+      "name": "library"
     },
     {
       "name": "unittest",
-      "lflags-posix": [
-        "-Llib"
-      ],
       "postBuildCommands-linux": [
         "echo Fixing up libwgpu so path...",
         "patchelf --set-rpath '$$ORIGIN' bin/wgpu-d-test-unittest"
@@ -54,13 +48,25 @@
       ]
     }
   ],
-  "libs": [
-    "wgpu_native"
+  "lflags-posix": ["-L$WGPU_D_PACKAGE_DIR/lib"],
+  "lflags-windows": ["/LIBPATH:$WGPU_D_PACKAGE_DIR/subprojects/wgpu"],
+  "libs": ["wgpu_native"],
+  "libs-windows": [
+    "d3dcompiler",
+    "ws2_32",
+    "advapi32",
+    "user32",
+    "userenv",
+    "bcrypt",
+    "ntdll"
   ],
   "copyFiles-linux": [
     "lib/libwgpu_native.so"
   ],
   "copyFiles-osx": [
     "lib/libwgpu_native.dylib"
+  ],
+  "copyFiles-windows": [
+    "lib/wgpu_native.dll"
   ]
 }
diff --git a/source/wgpu/api.d b/source/wgpu/api.d
@@ -148,13 +148,13 @@ alias SurfaceDescriptor = WGPUSurfaceDescriptor;
 ///
 alias SurfaceDescriptorFromAndroidNativeWindow = WGPUSurfaceDescriptorFromAndroidNativeWindow;
 ///
-alias SurfaceDescriptorFromCanvasHTMLSelector = WGPUSurfaceDescriptorFromCanvasHTMLSelector;
+alias SurfaceDescriptorFromCanvasHtmlSelector = WGPUSurfaceDescriptorFromCanvasHTMLSelector;
 ///
 alias SurfaceDescriptorFromMetalLayer = WGPUSurfaceDescriptorFromMetalLayer;
 ///
 alias SurfaceDescriptorFromWaylandSurface = WGPUSurfaceDescriptorFromWaylandSurface;
 ///
-alias SurfaceDescriptorFromWindowsHWND = WGPUSurfaceDescriptorFromWindowsHWND;
+alias SurfaceDescriptorFromWindowsHwnd = WGPUSurfaceDescriptorFromWindowsHWND;
 ///
 alias SurfaceDescriptorFromXcbWindow = WGPUSurfaceDescriptorFromXcbWindow;
 ///

diff --git a/source/wgpu/enums.d b/source/wgpu/enums.d
@@ -413,7 +413,7 @@ enum SType : WGPUSType {
   ///
   surfaceDescriptorFromMetalLayer,
   ///
-  surfaceDescriptorFromWindowsHWND,
+  surfaceDescriptorFromWindowsHwnd,
   ///
   surfaceDescriptorFromXlib,
   ///