diff --git a/Makefile b/Makefile index 49889b4..f820c1a 100644 --- a/Makefile +++ b/Makefile @@ -30,15 +30,18 @@ endif ifndef LIB_WGPU_EXT $(error Unsupported target OS '$(OS)') endif -LIB_WGPU_SOURCE := subprojects/wgpu/libwgpu.$(LIB_WGPU_EXT) -LIB_WGPU := lib/libwgpu.$(LIB_WGPU_EXT) -wgpu: $(LIB_WGPU) +LIB_WGPU_SOURCE := subprojects/wgpu +LIB_WGPU := lib/libwgpu_native +wgpu: $(LIB_WGPU).a $(LIB_WGPU).$(LIB_WGPU_EXT) .PHONY: wgpu $(LIB_WGPU_SOURCE): subprojects/wgpu.Makefile @make -C subprojects -f wgpu.Makefile -$(LIB_WGPU): $(LIB_WGPU_SOURCE) +$(LIB_WGPU).a: $(LIB_WGPU_SOURCE)/libwgpu_native.a @mkdir -p lib - @cp $(LIB_WGPU_SOURCE) lib/. + @cp $(LIB_WGPU_SOURCE)/libwgpu_native.a lib/. +$(LIB_WGPU).$(LIB_WGPU_EXT): $(LIB_WGPU_SOURCE)/libwgpu_native.$(LIB_WGPU_EXT) + @mkdir -p lib + @cp $(LIB_WGPU_SOURCE)/libwgpu_native.$(LIB_WGPU_EXT) lib/. ################################################# # Examples diff --git a/README.md b/README.md index 3a82551..2d77ad2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ D bindings to [wgpu-native](https://github.com/gfx-rs/wgpu-native) as an idiomatic wrapper around the library. -Targets wgpu-native [`v0.10.4.1`](https://github.com/gfx-rs/wgpu-native/releases/tag/v0.10.4.1). +Targets wgpu-native [`v0.17.0.2`](https://github.com/gfx-rs/wgpu-native/releases/tag/v0.17.0.2). ## Usage diff --git a/dub.json b/dub.json index cded27d..12b3858 100644 --- a/dub.json +++ b/dub.json @@ -55,12 +55,12 @@ } ], "libs": [ - "wgpu" + "wgpu_native" ], "copyFiles-linux": [ - "lib/libwgpu.so" + "lib/libwgpu_native.so" ], "copyFiles-osx": [ - "lib/libwgpu.dylib" + "lib/libwgpu_native.dylib" ] } diff --git a/subprojects/wgpu.Makefile b/subprojects/wgpu.Makefile index 0041571..00a16ea 100644 --- a/subprojects/wgpu.Makefile +++ b/subprojects/wgpu.Makefile @@ -1,5 +1,5 @@ -# See https://github.com/gfx-rs/wgpu-native/tree/v0.10.4.1 -VERSION := v0.10.4.1 +# See https://github.com/gfx-rs/wgpu-native/tree/v0.17.0.2 +VERSION := v0.17.0.2 OS := $(shell uname -s) ARCH := $(shell uname -m)