diff options
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 21 | ||||
| m--------- | externals/SDL | 0 | ||||
| m--------- | externals/Vulkan-Headers | 0 | ||||
| m--------- | externals/dynarmic | 0 | ||||
| -rw-r--r-- | externals/find-modules/FindFFmpeg.cmake | 8 | ||||
| -rw-r--r-- | externals/microprofile/microprofileui.h | 4 | ||||
| m--------- | externals/sirit | 0 |
7 files changed, 20 insertions, 13 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 7f0a6d069..eb6cb706d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -7,14 +7,11 @@ include(DownloadExternals) # xbyak if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) - add_subdirectory(xbyak) + add_subdirectory(xbyak EXCLUDE_FROM_ALL) endif() # Dynarmic if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) - if (ARCHITECTURE_arm64) - set(DYNARMIC_FRONTENDS "A32") - endif() set(DYNARMIC_NO_BUNDLED_FMT ON) set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE) add_subdirectory(dynarmic) @@ -67,9 +64,11 @@ if (YUZU_USE_EXTERNAL_SDL2) endif() set(SDL_STATIC ON) set(SDL_SHARED OFF) + if (APPLE) + set(SDL_FILE ON) + endif() add_subdirectory(SDL EXCLUDE_FROM_ALL) - add_library(SDL2 ALIAS SDL2-static) endif() # ENet @@ -92,10 +91,14 @@ endif() add_subdirectory(sirit) if (ENABLE_WEB_SERVICE) - find_package(OpenSSL 1.1) - if (OPENSSL_FOUND) - set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) - else() + if (NOT WIN32) + find_package(OpenSSL 1.1) + if (OPENSSL_FOUND) + set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) + endif() + endif() + + if (WIN32 OR NOT OPENSSL_FOUND) # LibreSSL set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") set(OPENSSLDIR "/etc/ssl/") diff --git a/externals/SDL b/externals/SDL -Subproject b424665e0899769b200231ba943353a5fee1b6b +Subproject f17058b562c8a1090c0c996b42982721ace9090 diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers -Subproject 33d4dd987fc8fc6475ff9ca2b4f0c3cc6e79333 +Subproject 2826791bed6a793f164bf534cd859968f13df8a diff --git a/externals/dynarmic b/externals/dynarmic -Subproject 424fdb5c5026ec5bdd7553271190397f63fb503 +Subproject a76a2fff534b5584c9921bc5c060e910e95b773 diff --git a/externals/find-modules/FindFFmpeg.cmake b/externals/find-modules/FindFFmpeg.cmake index add5b2c01..eedf28aea 100644 --- a/externals/find-modules/FindFFmpeg.cmake +++ b/externals/find-modules/FindFFmpeg.cmake @@ -185,3 +185,11 @@ foreach(c ${_FFmpeg_ALL_COMPONENTS}) endforeach() unset(_FFmpeg_ALL_COMPONENTS) unset(_FFmpeg_REQUIRED_VARS) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(FFmpeg + REQUIRED_VARS + FFmpeg_LIBRARIES + FFmpeg_INCLUDE_DIR + HANDLE_COMPONENTS +) diff --git a/externals/microprofile/microprofileui.h b/externals/microprofile/microprofileui.h index 1357a08fd..ca9fe7063 100644 --- a/externals/microprofile/microprofileui.h +++ b/externals/microprofile/microprofileui.h @@ -845,8 +845,6 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int MicroProfile& S = *MicroProfileGet(); MP_DEBUG_DUMP_RANGE(); int nY = nBaseY - UI.nOffsetY; - int64_t nNumBoxes = 0; - int64_t nNumLines = 0; uint32_t nFrameNext = (S.nFrameCurrent+1) % MICROPROFILE_MAX_FRAME_HISTORY; MicroProfileFrameState* pFrameCurrent = &S.Frames[S.nFrameCurrent]; @@ -1149,7 +1147,6 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int } } #endif - ++nNumBoxes; } else { @@ -1165,7 +1162,6 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int } nLinesDrawn[nStackPos] = nLineX; MicroProfileDrawLineVertical(nLineX, fYStart + 0.5f, fYEnd + 0.5f, nColor|UI.nOpacityForeground); - ++nNumLines; } } nStackPos--; diff --git a/externals/sirit b/externals/sirit -Subproject aa292d56650bc28f2b2d75973fab2e61d0136f9 +Subproject d7ad93a88864bda94e282e95028f90b5784e4d2 |