diff --git a/Makefile.in b/Makefile.in index 80b49a91..443e4fa9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -304,21 +304,6 @@ $(eval $(call rules-cmake,spirv-headers,32,CROSS)) $(eval $(call rules-cmake,spirv-headers,64,CROSS)) -## -## Vulkan-Loader -## - -VULKAN_LOADER_CMAKE_ARGS = -DUSE_MASM=OFF -VULKAN_LOADER_CMAKE_ARGS64 = -DVULKAN_HEADERS_INSTALL_DIR=$(VULKAN_HEADERS_DST64) -VULKAN_LOADER_CMAKE_ARGS32 = -DVULKAN_HEADERS_INSTALL_DIR=$(VULKAN_HEADERS_DST32) -VULKAN_LOADER_CFLAGS = -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 # 0x0A00 is _WIN32_WINNT_WIN10 -VULKAN_LOADER_DEPENDS = vulkan-headers spirv-headers - -$(eval $(call rules-source,vulkan-loader,$(SRCDIR)/Vulkan-Loader)) -$(eval $(call rules-cmake,vulkan-loader,32,CROSS)) -$(eval $(call rules-cmake,vulkan-loader,64,CROSS)) - - ## ## glslang ## @@ -637,7 +622,7 @@ VKD3D_CONFIGURE_ARGS = \ SONAME_LIBVULKAN=vulkan-1 \ VKD3D_LDFLAGS = -static-libgcc $(CROSSLDFLAGS) -VKD3D_DEPENDS = vulkan-loader vulkan-headers spirv-headers +VKD3D_DEPENDS = vulkan-headers spirv-headers $(eval $(call rules-source,vkd3d,$(SRCDIR)/vkd3d)) $(eval $(call rules-autoconf,vkd3d,32,CROSS)) diff --git a/Vulkan-Loader b/Vulkan-Loader deleted file mode 160000 index 538b2676..00000000 --- a/Vulkan-Loader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 538b2676eaac29565e4f1034a6f8a59ce158213d