Update dependencies

This commit is contained in:
BtbN 2021-05-30 18:30:44 +02:00
parent 80c4d27a22
commit 867c5ce14d
24 changed files with 51 additions and 51 deletions

View file

@ -1,4 +1,4 @@
From cc0b0633e19356c45caa66c5ac18f8f49ba3e214 Mon Sep 17 00:00:00 2001
From 5cb3764fc555d685200f7f45a75e175ead1aea6c Mon Sep 17 00:00:00 2001
From: Syoyo Fujita <syoyo@lighttransport.com>
Date: Thu, 28 May 2020 21:38:16 +0900
Subject: [PATCH 1/4] Fix build on MinGW cross compiling environment.
@ -10,10 +10,10 @@ Subject: [PATCH 1/4] Fix build on MinGW cross compiling environment.
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index db1ad7807..04faf23cc 100644
index e01c97375..219b99bd5 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -151,7 +151,7 @@ if(WIN32)
@@ -158,7 +158,7 @@ if(WIN32)
if (USE_MASM)
enable_language(ASM_MASM)
endif ()
@ -22,9 +22,9 @@ index db1ad7807..04faf23cc 100644
if(MINGW)
set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS})
elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND)
@@ -171,6 +171,8 @@ if(WIN32)
@@ -178,6 +178,8 @@ if(WIN32)
add_library(loader-unknown-chain OBJECT unknown_ext_chain.c)
target_compile_options(loader-unknown-chain PUBLIC "$<$<CONFIG:DEBUG>:${LOCAL_C_FLAGS_REL}>")
set_target_properties(loader-unknown-chain PROPERTIES CMAKE_C_FLAGS_DEBUG "${MODIFIED_C_FLAGS_DEBUG}")
target_compile_options(loader-unknown-chain PUBLIC ${MSVC_LOADER_COMPILE_OPTIONS})
+
+ target_include_directories(loader-unknown-chain PRIVATE "$<TARGET_PROPERTY:Vulkan::Headers,INTERFACE_INCLUDE_DIRECTORIES>")
@ -32,10 +32,10 @@ index db1ad7807..04faf23cc 100644
elseif(APPLE)
# For MacOS, use the C code and force the compiler's tail-call optimization instead of using assembly code.
diff --git a/loader/loader.c b/loader/loader.c
index 6a60ee7bc..20790c12c 100644
index c3f482b41..4fe42de73 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -79,6 +79,19 @@
@@ -83,6 +83,19 @@
typedef HRESULT (APIENTRY *PFN_CreateDXGIFactory1)(REFIID riid, void **ppFactory);
static PFN_CreateDXGIFactory1 fpCreateDXGIFactory1;