Преглед изворни кода

externals: update opus to 1.4

liushuyu пре 2 година
родитељ
комит
a0a3566977
2 измењених фајлова са 10 додато и 10 уклоњено
  1. 9 9
      externals/opus/CMakeLists.txt
  2. 1 1
      externals/opus/opus

+ 9 - 9
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_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)
 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(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()
 endif()
 
 
 add_library(opus
 add_library(opus
@@ -233,7 +233,7 @@ endif()
 
 
 target_compile_definitions(opus
 target_compile_definitions(opus
 PUBLIC
 PUBLIC
-    -DOPUS_VERSION="\\"1.3.1\\""
+    -DOPUS_VERSION="\\"1.4.0\\""
 
 
 PRIVATE
 PRIVATE
     # Use C99 intrinsics to speed up float-to-int conversion
     # Use C99 intrinsics to speed up float-to-int conversion

+ 1 - 1
externals/opus/opus

@@ -1 +1 @@
-Subproject commit ad8fe90db79b7d2a135e3dfd2ed6631b0c5662ab
+Subproject commit 82ac57d9f1aaf575800cf17373348e45b7ce6c0d