Update dependencies

This commit is contained in:
BtbN 2021-07-12 16:29:31 +02:00
parent dbd238fcde
commit 0631e027e9
34 changed files with 51 additions and 76 deletions

View file

@ -1,4 +1,4 @@
From 4aa6517c8e68b5f507cdcd3e8badbe7dd4369d5a Mon Sep 17 00:00:00 2001
From 6e1f9e7ce670b295bf5d24564b1ec0a179a0ee34 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 4 Apr 2021 23:29:53 +0200
Subject: [PATCH 4/4] Unlock building static loader on any OS
@ -27,7 +27,7 @@ index bd01fa016..91e5652f3 100644
if(BUILD_STATIC_LOADER)
message(WARNING "The BUILD_STATIC_LOADER option has been set. Note that this will only work on MacOS and is not supported "
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index ab0a49c55..dd9d47183 100644
index ca768223f..f37b18908 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -224,6 +224,22 @@ if(WIN32)
@ -54,15 +54,15 @@ index ab0a49c55..dd9d47183 100644
SHARED
$<TARGET_OBJECTS:loader-opt>
@@ -238,6 +254,8 @@ if(WIN32)
vulkan-1
PREFIX
"")
set_target_properties(vulkan
PROPERTIES
OUTPUT_NAME vulkan-1)
+ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS LOADER_DYNAMIC_LIB)
+ endif()
target_link_libraries(vulkan Vulkan::Headers)
if(ENABLE_WIN10_ONECORE AND MSVC)
@@ -259,17 +277,19 @@ else()
@@ -260,17 +278,19 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-typedef-redefinition")
endif()
@ -83,7 +83,7 @@ index ab0a49c55..dd9d47183 100644
target_link_libraries(vulkan ${CMAKE_DL_LIBS} m)
if (NOT ANDROID)
target_link_libraries(vulkan pthread)
@@ -341,6 +361,7 @@ if(PKG_CONFIG_FOUND)
@@ -342,6 +362,7 @@ if(PKG_CONFIG_FOUND)
foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
endforeach()
@ -92,7 +92,7 @@ index ab0a49c55..dd9d47183 100644
set(VULKAN_LIB_SUFFIX "-1")
endif ()
diff --git a/loader/loader.c b/loader/loader.c
index 4fe42de73..1eb88ed86 100644
index dc26a9c4f..4bafed2ed 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -7914,7 +7914,7 @@ out: