Merge from Perforce 2024-01-31 13:53:32.179101

ValveSoftware · Jan 31, 2024 · 86445fd · 86445fd
1 parent fa84e4d
commit 86445fd
Show file tree

Hide file tree

Showing 222 changed files with 798 additions and 778 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Steam Audio 4.5.0
+# Steam Audio 4.5.1
 
 Valve Corporation
 

diff --git a/fmod/CMakeLists.txt b/fmod/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright 2017 Valve Corporation. All rights reserved. Subject to the following license:
+# Copyright 2017-2023 Valve Corporation. Subject to the following license:
 # https://valvesoftware.github.io/steam-audio/license.html
 
 cmake_minimum_required(VERSION 3.17)
 
-project(Phonon VERSION 4.5.0)
+project(Phonon VERSION 4.5.1)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/build")

diff --git a/fmod/build/FindFMOD.cmake b/fmod/build/FindFMOD.cmake
@@ -1,16 +1,16 @@
-# Copyright 2017 Valve Corporation. All rights reserved. Subject to the following license:
+# Copyright 2017-2023 Valve Corporation. Subject to the following license:
 # https://valvesoftware.github.io/steam-audio/license.html
 
 include(FindPackageHandleStandardArgs)
 
-find_path(FMOD_INCLUDE_DIR 
+find_path(FMOD_INCLUDE_DIR
 	NAMES 			fmod.h
 	PATHS 			${CMAKE_HOME_DIRECTORY}/include
 	PATH_SUFFIXES 	fmod
 )
 
-find_package_handle_standard_args(FMOD 
-	FOUND_VAR 		FMOD_FOUND 
+find_package_handle_standard_args(FMOD
+	FOUND_VAR 		FMOD_FOUND
 	REQUIRED_VARS 	FMOD_INCLUDE_DIR
 )
 

diff --git a/fmod/build/FindSphinx.cmake b/fmod/build/FindSphinx.cmake
@@ -1,4 +1,4 @@
-# Copyright 2017 Valve Corporation. All rights reserved. Subject to the following license:
+# Copyright 2017-2023 Valve Corporation. Subject to the following license:
 # https://valvesoftware.github.io/steam-audio/license.html
 
 include(FindPackageHandleStandardArgs)

diff --git a/fmod/build/FindSteamAudio.cmake b/fmod/build/FindSteamAudio.cmake
@@ -1,12 +1,12 @@
-# Copyright 2017 Valve Corporation. All rights reserved. Subject to the following license:
+# Copyright 2017-2023 Valve Corporation. Subject to the following license:
 # https://valvesoftware.github.io/steam-audio/license.html
 
 include(FindPackageHandleStandardArgs)
 include(SteamAudioHelpers)
 
 get_local_lib_path(IPL_LIB_PATH)
 
-find_path(SteamAudio_INCLUDE_DIR 
+find_path(SteamAudio_INCLUDE_DIR
 	NAMES 			phonon.h
 	PATHS 			${CMAKE_HOME_DIRECTORY}/include
 	PATH_SUFFIXES 	phonon
@@ -18,13 +18,13 @@ if (BUILD_SHARED_LIBS)
 		PATHS ${IPL_LIB_PATH}
 	)
 
-	find_package_handle_standard_args(SteamAudio 
-		FOUND_VAR 		SteamAudio_FOUND 
+	find_package_handle_standard_args(SteamAudio
+		FOUND_VAR 		SteamAudio_FOUND
 		REQUIRED_VARS 	SteamAudio_INCLUDE_DIR
 	)
 else()
-	find_package_handle_standard_args(SteamAudio 
-		FOUND_VAR 		SteamAudio_FOUND 
+	find_package_handle_standard_args(SteamAudio
+		FOUND_VAR 		SteamAudio_FOUND
 		REQUIRED_VARS 	SteamAudio_INCLUDE_DIR SteamAudio_LIBRARY
 	)
 endif()

diff --git a/fmod/build/SteamAudioHelpers.cmake b/fmod/build/SteamAudioHelpers.cmake
@@ -1,4 +1,4 @@
-# Copyright 2017 Valve Corporation. All rights reserved. Subject to the following license:
+# Copyright 2017-2023 Valve Corporation. Subject to the following license:
 # https://valvesoftware.github.io/steam-audio/license.html
 
 function (get_local_lib_path LIB_PATH)

diff --git a/fmod/build/build.py b/fmod/build/build.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Valve Corporation. All rights reserved. Subject to the following license:
+# Copyright 2017-2023 Valve Corporation. Subject to the following license:
 # https://valvesoftware.github.io/steam-audio/license.html
 
 import argparse

diff --git a/fmod/build/toolchain_android_armv7.cmake b/fmod/build/toolchain_android_armv7.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Valve Corporation. All rights reserved.
+# Copyright 2017-2023 Valve Corporation.
 #
 
 set(CMAKE_SYSTEM_NAME Android)

diff --git a/fmod/build/toolchain_android_armv8.cmake b/fmod/build/toolchain_android_armv8.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Valve Corporation. All rights reserved.
+# Copyright 2017-2023 Valve Corporation.
 #
 
 set(CMAKE_SYSTEM_NAME Android)

diff --git a/fmod/build/toolchain_android_x64.cmake b/fmod/build/toolchain_android_x64.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Valve Corporation. All rights reserved.
+# Copyright 2017-2023 Valve Corporation.
 #
 
 set(CMAKE_SYSTEM_NAME Android)

diff --git a/fmod/build/toolchain_android_x86.cmake b/fmod/build/toolchain_android_x86.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Valve Corporation. All rights reserved.
+# Copyright 2017-2023 Valve Corporation.
 #
 
 set(CMAKE_SYSTEM_NAME Android)

diff --git a/fmod/build/toolchain_ios.cmake b/fmod/build/toolchain_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Valve Corporation. All rights reserved.
+# Copyright 2017-2023 Valve Corporation.
 #
 
 set(CMAKE_SYSTEM_NAME iOS)

diff --git a/fmod/doc/CMakeLists.txt b/fmod/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2017 Valve Corporation. All rights reserved. Subject to the following license:
+# Copyright 2017-2023 Valve Corporation. Subject to the following license:
 # https://valvesoftware.github.io/steam-audio/license.html
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)

diff --git a/fmod/doc/conf.py b/fmod/doc/conf.py
@@ -18,7 +18,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Steam Audio FMOD Studio Integration'
-copyright = '2021, Valve Corporation'
+copyright = '2017-2023, Valve Corporation'
 author = 'Valve Corporation'