Merge #217

217: Backport x11 feature to 0.4 branch r=Frizi a=Frizi Co-authored-by: nodef0 <d2isgreat@gmail.com>
amethyst · Oct 2, 2019 · b3b3870 · b3b3870
2 parents 2bb2341 + 8332217
commit b3b3870
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ ifeq ($(OS),Windows_NT)
 else
 	UNAME_S:=$(shell uname -s)
 	ifeq ($(UNAME_S),Linux)
-		RENDY_BACKEND=vulkan
+		RENDY_BACKEND=vulkan-x11
 	endif
 	ifeq ($(UNAME_S),Darwin)
 		RENDY_BACKEND=metal

diff --git a/rendy/Cargo.toml b/rendy/Cargo.toml
@@ -32,6 +32,7 @@ empty = ["rendy-util/gfx-backend-empty"]
 dx12 = ["rendy-util/gfx-backend-dx12"]
 metal = ["rendy-util/gfx-backend-metal"]
 vulkan = ["rendy-util/gfx-backend-vulkan"]
+vulkan-x11 = ["vulkan", "rendy-util/vulkan-x11"]
 no-slow-safety-checks = ["rendy-util/no-slow-safety-checks"]
 profiler = ["thread_profiler/thread_profiler"]
 

diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -22,6 +22,7 @@ empty = ["gfx-backend-empty"]
 dx12 = ["gfx-backend-dx12"]
 metal = ["gfx-backend-metal"]
 vulkan = ["gfx-backend-vulkan"]
+vulkan-x11 = ["vulkan", "gfx-backend-vulkan/x11"]
 no-slow-safety-checks = []
 
 [dependencies]