Browse Source
Merge pull request #2440 from lioncash/dynarmic
externals: Update dynarmic to master
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
5 deletions
-
externals/CMakeLists.txt
-
externals/dynarmic
|
|
|
@ -7,6 +7,10 @@ include(DownloadExternals) |
|
|
|
add_library(catch-single-include INTERFACE) |
|
|
|
target_include_directories(catch-single-include INTERFACE catch/single_include) |
|
|
|
|
|
|
|
# libfmt |
|
|
|
add_subdirectory(fmt) |
|
|
|
add_library(fmt::fmt ALIAS fmt) |
|
|
|
|
|
|
|
# Dynarmic |
|
|
|
if (ARCHITECTURE_x86_64) |
|
|
|
set(DYNARMIC_TESTS OFF) |
|
|
|
@ -14,10 +18,6 @@ if (ARCHITECTURE_x86_64) |
|
|
|
add_subdirectory(dynarmic) |
|
|
|
endif() |
|
|
|
|
|
|
|
# libfmt |
|
|
|
add_subdirectory(fmt) |
|
|
|
add_library(fmt::fmt ALIAS fmt) |
|
|
|
|
|
|
|
# getopt |
|
|
|
if (MSVC) |
|
|
|
add_subdirectory(getopt) |
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit 4e6848d1c9e8dadc70595c15b5589f8b14aad478 |
|
|
|
Subproject commit 2683a9a3e316b5c3f387bbe6787732b9ff44b8db |
