diff options
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 10 | ||||
| m--------- | externals/Vulkan-Utility-Libraries | 0 | ||||
| m--------- | externals/dynarmic | 0 | ||||
| m--------- | externals/oaknut | 0 | ||||
| -rw-r--r-- | externals/tz/tz/tz.cpp | 4 | ||||
| -rw-r--r-- | externals/tz/tz/tz.h | 4 |
6 files changed, 12 insertions, 6 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 15b444338..d49a2e43e 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -14,16 +14,17 @@ set(BUILD_SHARED_LIBS OFF) # Skip install rules for all externals set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) -# xbyak +# Xbyak (also used by Dynarmic, so needs to be added first) if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) add_subdirectory(xbyak) endif() -# Dynarmic +# Oaknut (also used by Dynarmic, so needs to be added first) if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut) add_subdirectory(oaknut) endif() +# Dynarmic if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic) set(DYNARMIC_IGNORE_ASSERTS ON) add_subdirectory(dynarmic) @@ -154,6 +155,11 @@ if (YUZU_USE_EXTERNAL_VULKAN_HEADERS) add_subdirectory(Vulkan-Headers) endif() +# Vulkan-Utility-Libraries +if (YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES) + add_subdirectory(Vulkan-Utility-Libraries) +endif() + # TZDB (Time Zone Database) add_subdirectory(nx_tzdb) diff --git a/externals/Vulkan-Utility-Libraries b/externals/Vulkan-Utility-Libraries new file mode 160000 +Subproject 524f8910d0e4a5f2ec5961996b23e5b74b95cb1 diff --git a/externals/dynarmic b/externals/dynarmic -Subproject 0df09e2f6b61c2d7ad2f2053d4f020a5c33e037 +Subproject ca0e264f4f962e29baa23a3282ce484625866b9 diff --git a/externals/oaknut b/externals/oaknut -Subproject 918bd94f025d6a2de13978468351598997ae390 +Subproject 9d091109deb445bc6e9289c6195a282b7c993d4 diff --git a/externals/tz/tz/tz.cpp b/externals/tz/tz/tz.cpp index 0c8b68217..04fa6cc8a 100644 --- a/externals/tz/tz/tz.cpp +++ b/externals/tz/tz/tz.cpp @@ -1625,11 +1625,11 @@ s32 ParseTimeZoneBinary(Rule& out_rule, std::span<const u8> binary) { return 0; } -bool localtime_rz(CalendarTimeInternal* tmp, Rule* sp, time_t* timep) { +bool localtime_rz(CalendarTimeInternal* tmp, Rule const* sp, time_t* timep) { return localsub(sp, timep, 0, tmp) == nullptr; } -u32 mktime_tzname(time_t* out_time, Rule* sp, CalendarTimeInternal* tmp) { +u32 mktime_tzname(time_t* out_time, Rule const* sp, CalendarTimeInternal* tmp) { return time1(out_time, tmp, localsub, sp, 0); } diff --git a/externals/tz/tz/tz.h b/externals/tz/tz/tz.h index 38605cfb1..dae4459bc 100644 --- a/externals/tz/tz/tz.h +++ b/externals/tz/tz/tz.h @@ -75,7 +75,7 @@ static_assert(sizeof(CalendarTimeInternal) == 0x3C, "CalendarTimeInternal has th s32 ParseTimeZoneBinary(Rule& out_rule, std::span<const u8> binary); -bool localtime_rz(CalendarTimeInternal* tmp, Rule* sp, time_t* timep); -u32 mktime_tzname(time_t* out_time, Rule* sp, CalendarTimeInternal* tmp); +bool localtime_rz(CalendarTimeInternal* tmp, Rule const* sp, time_t* timep); +u32 mktime_tzname(time_t* out_time, Rule const* sp, CalendarTimeInternal* tmp); } // namespace Tz |