mirror of
https://github.com/yuzu-emu/yuzu-android.git
synced 2024-11-27 12:34:19 +01:00
Merge pull request #2440 from lioncash/dynarmic
externals: Update dynarmic to master
This commit is contained in:
commit
0e9a17b029
8
externals/CMakeLists.txt
vendored
8
externals/CMakeLists.txt
vendored
@ -7,6 +7,10 @@ include(DownloadExternals)
|
|||||||
add_library(catch-single-include INTERFACE)
|
add_library(catch-single-include INTERFACE)
|
||||||
target_include_directories(catch-single-include INTERFACE catch/single_include)
|
target_include_directories(catch-single-include INTERFACE catch/single_include)
|
||||||
|
|
||||||
|
# libfmt
|
||||||
|
add_subdirectory(fmt)
|
||||||
|
add_library(fmt::fmt ALIAS fmt)
|
||||||
|
|
||||||
# Dynarmic
|
# Dynarmic
|
||||||
if (ARCHITECTURE_x86_64)
|
if (ARCHITECTURE_x86_64)
|
||||||
set(DYNARMIC_TESTS OFF)
|
set(DYNARMIC_TESTS OFF)
|
||||||
@ -14,10 +18,6 @@ if (ARCHITECTURE_x86_64)
|
|||||||
add_subdirectory(dynarmic)
|
add_subdirectory(dynarmic)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# libfmt
|
|
||||||
add_subdirectory(fmt)
|
|
||||||
add_library(fmt::fmt ALIAS fmt)
|
|
||||||
|
|
||||||
# getopt
|
# getopt
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
add_subdirectory(getopt)
|
add_subdirectory(getopt)
|
||||||
|
2
externals/dynarmic
vendored
2
externals/dynarmic
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 4e6848d1c9e8dadc70595c15b5589f8b14aad478
|
Subproject commit 2683a9a3e316b5c3f387bbe6787732b9ff44b8db
|
Loading…
Reference in New Issue
Block a user