diff options
| author | liushuyu <liushuyu011@gmail.com> | 2023-10-10 00:51:32 +0200 |
|---|---|---|
| committer | liushuyu <liushuyu011@gmail.com> | 2023-10-22 06:29:19 +0200 |
| commit | a0a3566977428870b149351686fefd93ab0bd212 (patch) | |
| tree | f1b5abbfd7bc97eaa913607c370e52fd8726b439 /externals | |
| parent | Merge pull request #11831 from liamwhite/hosversionbetween (diff) | |
| download | yuzu-a0a3566977428870b149351686fefd93ab0bd212.tar yuzu-a0a3566977428870b149351686fefd93ab0bd212.tar.gz yuzu-a0a3566977428870b149351686fefd93ab0bd212.tar.bz2 yuzu-a0a3566977428870b149351686fefd93ab0bd212.tar.lz yuzu-a0a3566977428870b149351686fefd93ab0bd212.tar.xz yuzu-a0a3566977428870b149351686fefd93ab0bd212.tar.zst yuzu-a0a3566977428870b149351686fefd93ab0bd212.zip | |
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/opus/CMakeLists.txt | 18 | ||||
| m--------- | externals/opus/opus | 0 |
2 files changed, 9 insertions, 9 deletions
diff --git a/externals/opus/CMakeLists.txt b/externals/opus/CMakeLists.txt index d9a03423d..574e2e44b 100644 --- a/externals/opus/CMakeLists.txt +++ b/externals/opus/CMakeLists.txt @@ -11,16 +11,16 @@ option(OPUS_CUSTOM_MODES "Enable non-Opus modes, e.g. 44.1 kHz & 2^n frames" OFF option(OPUS_FIXED_POINT "Compile as fixed-point (for machines without a fast enough FPU)" OFF) option(OPUS_ENABLE_FLOAT_API "Compile with the floating point API (for machines with float library" ON) -include(opus/opus_functions.cmake) +include(opus/cmake/OpusFunctions.cmake) if(OPUS_STACK_PROTECTOR) - if(NOT MSVC) # GC on by default on MSVC - check_and_set_flag(STACK_PROTECTION_STRONG -fstack-protector-strong) - endif() -else() - if(MSVC) - check_and_set_flag(BUFFER_SECURITY_CHECK /GS-) - endif() + if(MSVC) + target_compile_options(opus PRIVATE /GS) + else() + target_compile_options(opus PRIVATE -fstack-protector-strong) + endif() +elseif(STACK_PROTECTOR_DISABLED_SUPPORTED) + target_compile_options(opus PRIVATE /GS-) endif() add_library(opus @@ -233,7 +233,7 @@ endif() target_compile_definitions(opus PUBLIC - -DOPUS_VERSION="\\"1.3.1\\"" + -DOPUS_VERSION="\\"1.4.0\\"" PRIVATE # Use C99 intrinsics to speed up float-to-int conversion diff --git a/externals/opus/opus b/externals/opus/opus -Subproject ad8fe90db79b7d2a135e3dfd2ed6631b0c5662a +Subproject 82ac57d9f1aaf575800cf17373348e45b7ce6c0 |