summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--externals/opus/CMakeLists.txt18
m---------externals/opus/opus0
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
11option(OPUS_FIXED_POINT "Compile as fixed-point (for machines without a fast enough FPU)" OFF) 11option(OPUS_FIXED_POINT "Compile as fixed-point (for machines without a fast enough FPU)" OFF)
12option(OPUS_ENABLE_FLOAT_API "Compile with the floating point API (for machines with float library" ON) 12option(OPUS_ENABLE_FLOAT_API "Compile with the floating point API (for machines with float library" ON)
13 13
14include(opus/opus_functions.cmake) 14include(opus/cmake/OpusFunctions.cmake)
15 15
16if(OPUS_STACK_PROTECTOR) 16if(OPUS_STACK_PROTECTOR)
17 if(NOT MSVC) # GC on by default on MSVC 17 if(MSVC)
18 check_and_set_flag(STACK_PROTECTION_STRONG -fstack-protector-strong) 18 target_compile_options(opus PRIVATE /GS)
19 endif() 19 else()
20else() 20 target_compile_options(opus PRIVATE -fstack-protector-strong)
21 if(MSVC) 21 endif()
22 check_and_set_flag(BUFFER_SECURITY_CHECK /GS-) 22elseif(STACK_PROTECTOR_DISABLED_SUPPORTED)
23 endif() 23 target_compile_options(opus PRIVATE /GS-)
24endif() 24endif()
25 25
26add_library(opus 26add_library(opus
@@ -233,7 +233,7 @@ endif()
233 233
234target_compile_definitions(opus 234target_compile_definitions(opus
235PUBLIC 235PUBLIC
236 -DOPUS_VERSION="\\"1.3.1\\"" 236 -DOPUS_VERSION="\\"1.4.0\\""
237 237
238PRIVATE 238PRIVATE
239 # Use C99 intrinsics to speed up float-to-int conversion 239 # Use C99 intrinsics to speed up float-to-int conversion
diff --git a/externals/opus/opus b/externals/opus/opus
Subproject ad8fe90db79b7d2a135e3dfd2ed6631b0c5662a Subproject 82ac57d9f1aaf575800cf17373348e45b7ce6c0