diff options
| author | Feng Chen <VonChenPlus@gmail.com> | 2021-12-18 13:57:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 13:57:14 +0800 |
| commit | e49184e6069a9d791d2df3c1958f5c4b1187e124 (patch) | |
| tree | b776caf722e0be0e680f67b0ad0842628162ef1c /externals | |
| parent | 4dd85f86a89338ff84d05a3981c14f6de1be4606 (diff) | |
| parent | 77d06d5df02d18da381bcd572ce11fee790d9edf (diff) | |
Merge branch 'yuzu-emu:master' into convert_legacy
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 4 | ||||
| m--------- | externals/SDL | 0 | ||||
| m--------- | externals/cubeb | 0 | ||||
| -rw-r--r-- | externals/find-modules/FindUnicorn.cmake | 18 |
4 files changed, 0 insertions, 22 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index a76a3d800..64d1e6aec 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -44,10 +44,6 @@ target_include_directories(mbedtls PUBLIC ./mbedtls/include) add_library(microprofile INTERFACE) target_include_directories(microprofile INTERFACE ./microprofile) -# Unicorn -add_library(unicorn-headers INTERFACE) -target_include_directories(unicorn-headers INTERFACE ./unicorn/include) - # libusb if (NOT LIBUSB_FOUND OR YUZU_USE_BUNDLED_LIBUSB) add_subdirectory(libusb) diff --git a/externals/SDL b/externals/SDL -Subproject 25f9ed87ff6947d9576fc9d79dee0784e638ac5 +Subproject 2e9821423a237a1206e3c09020778faacfe430b diff --git a/externals/cubeb b/externals/cubeb -Subproject 1d66483ad2b93f0e00e175f9480c771af90003a +Subproject 75d9d125ee655ef80f3bfcd97ae5a805931042b diff --git a/externals/find-modules/FindUnicorn.cmake b/externals/find-modules/FindUnicorn.cmake deleted file mode 100644 index a0f2a71f6..000000000 --- a/externals/find-modules/FindUnicorn.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# Exports: -# LIBUNICORN_FOUND -# LIBUNICORN_INCLUDE_DIR -# LIBUNICORN_LIBRARY - -find_path(LIBUNICORN_INCLUDE_DIR - unicorn/unicorn.h - HINTS $ENV{UNICORNDIR} - PATH_SUFFIXES include) - -find_library(LIBUNICORN_LIBRARY - NAMES unicorn - HINTS $ENV{UNICORNDIR}) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(unicorn DEFAULT_MSG - LIBUNICORN_LIBRARY LIBUNICORN_INCLUDE_DIR) -mark_as_advanced(LIBUNICORN_INCLUDE_DIR LIBUNICORN_LIBRARY) |