diff --git a/external/include/fmod-2.2.13/fmod/fmod_common.h b/external/include/fmod-2.2.13/fmod/fmod_common.h index 51591acfae..4a7c90d213 100644 --- a/external/include/fmod-2.2.13/fmod/fmod_common.h +++ b/external/include/fmod-2.2.13/fmod/fmod_common.h @@ -56,7 +56,7 @@ typedef struct FMOD_ASYNCREADINFO FMOD_ASYNCREADINFO; /* FMOD constants */ -#define FMOD_VERSION 0x00020213 /* 0xaaaabbcc -> aaaa = product version, bb = major version, cc = minor version.*/ +#define FMOD_VERSION 0x00020220 /* 0xaaaabbcc -> aaaa = product version, bb = major version, cc = minor version.*/ typedef unsigned int FMOD_DEBUG_FLAGS; #define FMOD_DEBUG_LEVEL_NONE 0x00000000 @@ -439,6 +439,7 @@ typedef enum FMOD_OUTPUTTYPE FMOD_OUTPUTTYPE_AAUDIO, FMOD_OUTPUTTYPE_AUDIOWORKLET, FMOD_OUTPUTTYPE_PHASE, + FMOD_OUTPUTTYPE_OHAUDIO, FMOD_OUTPUTTYPE_MAX, FMOD_OUTPUTTYPE_FORCEINT = 65536 @@ -795,6 +796,7 @@ typedef struct FMOD_ADVANCEDSETTINGS unsigned int randomSeed; int maxConvolutionThreads; int maxOpusCodecs; + int maxSpatialObjects; } FMOD_ADVANCEDSETTINGS; typedef struct FMOD_TAG diff --git a/external/include/fmod-2.2.13/fmod/fmod_errors.h b/external/include/fmod-2.2.13/fmod/fmod_errors.h index 6764299a57..c6d8707a24 100644 --- a/external/include/fmod-2.2.13/fmod/fmod_errors.h +++ b/external/include/fmod-2.2.13/fmod/fmod_errors.h @@ -49,7 +49,7 @@ static const char *FMOD_ErrorString(FMOD_RESULT errcode) case FMOD_ERR_HTTP_TIMEOUT: return "The HTTP request timed out."; case FMOD_ERR_INITIALIZATION: return "FMOD was not initialized correctly to support this function."; case FMOD_ERR_INITIALIZED: return "Cannot call this command after System::init."; - case FMOD_ERR_INTERNAL: return "An error occurred that wasn't supposed to. Contact support."; + case FMOD_ERR_INTERNAL: return "An error occured in the FMOD system. Use the logging version of FMOD for more information."; case FMOD_ERR_INVALID_FLOAT: return "Value passed in was a NaN, Inf or denormalized float."; case FMOD_ERR_INVALID_HANDLE: return "An invalid object handle was used."; case FMOD_ERR_INVALID_PARAM: return "An invalid parameter was passed to this function."; @@ -87,7 +87,7 @@ static const char *FMOD_ErrorString(FMOD_RESULT errcode) case FMOD_ERR_TAGNOTFOUND: return "The specified tag could not be found or there are no tags."; case FMOD_ERR_TOOMANYCHANNELS: return "The sound created exceeds the allowable input channel count. This can be increased using the 'maxinputchannels' parameter in System::setSoftwareFormat."; case FMOD_ERR_TRUNCATED: return "The retrieved string is too long to fit in the supplied buffer and has been truncated."; - case FMOD_ERR_UNIMPLEMENTED: return "Something in FMOD hasn't been implemented when it should be! contact support!"; + case FMOD_ERR_UNIMPLEMENTED: return "Something in FMOD hasn't been implemented when it should be. Contact support."; case FMOD_ERR_UNINITIALIZED: return "This command failed because System::init or System::setDriver was not called."; case FMOD_ERR_UNSUPPORTED: return "A command issued was not supported by this object. Possibly a plugin without certain callbacks specified."; case FMOD_ERR_VERSION: return "The version number of this file format is not supported."; diff --git a/external/lib/linux/arm64/libfmod.so b/external/lib/linux/arm64/libfmod.so new file mode 120000 index 0000000000..40d7b0f71a --- /dev/null +++ b/external/lib/linux/arm64/libfmod.so @@ -0,0 +1 @@ +libfmod.so.13.20 \ No newline at end of file diff --git a/external/lib/linux/arm64/libfmod.so.13 b/external/lib/linux/arm64/libfmod.so.13 new file mode 120000 index 0000000000..40d7b0f71a --- /dev/null +++ b/external/lib/linux/arm64/libfmod.so.13 @@ -0,0 +1 @@ +libfmod.so.13.20 \ No newline at end of file diff --git a/external/lib/linux/arm64/libfmod.so.13.20 b/external/lib/linux/arm64/libfmod.so.13.20 new file mode 100755 index 0000000000..d78ff1cf3b Binary files /dev/null and b/external/lib/linux/arm64/libfmod.so.13.20 differ diff --git a/external/lib/linux/arm64/meson.build b/external/lib/linux/arm64/meson.build new file mode 100644 index 0000000000..f8d36da171 --- /dev/null +++ b/external/lib/linux/arm64/meson.build @@ -0,0 +1,9 @@ +cp = find_program('cp') +fmod_so = files('libfmod.so.13.20', 'libfmod.so.13', 'libfmod.so') +if get_option('install_fmod') + install_data(fmod_so, install_dir:get_option('fmod_dir'), install_mode:'rwxr-xr-x') +endif + +fmod = compiler.find_library('fmod', dirs: meson.current_source_dir()) + +deps += fmod diff --git a/external/lib/linux/meson.build b/external/lib/linux/meson.build index 6a53fefec9..6ebd74f25c 100644 --- a/external/lib/linux/meson.build +++ b/external/lib/linux/meson.build @@ -1 +1,5 @@ -subdir('x86_64') +if host_machine.cpu_family() == 'aarch64' + subdir('arm64') +elif host_machine.cpu_family() == 'x86_64' + subdir('x86_64') +endif diff --git a/external/lib/linux/x86_64/libfmod.so b/external/lib/linux/x86_64/libfmod.so deleted file mode 100755 index a6eeab758a..0000000000 Binary files a/external/lib/linux/x86_64/libfmod.so and /dev/null differ diff --git a/external/lib/linux/x86_64/libfmod.so b/external/lib/linux/x86_64/libfmod.so new file mode 120000 index 0000000000..40d7b0f71a --- /dev/null +++ b/external/lib/linux/x86_64/libfmod.so @@ -0,0 +1 @@ +libfmod.so.13.20 \ No newline at end of file diff --git a/external/lib/linux/x86_64/libfmod.so.13 b/external/lib/linux/x86_64/libfmod.so.13 deleted file mode 100755 index a6eeab758a..0000000000 Binary files a/external/lib/linux/x86_64/libfmod.so.13 and /dev/null differ diff --git a/external/lib/linux/x86_64/libfmod.so.13 b/external/lib/linux/x86_64/libfmod.so.13 new file mode 120000 index 0000000000..40d7b0f71a --- /dev/null +++ b/external/lib/linux/x86_64/libfmod.so.13 @@ -0,0 +1 @@ +libfmod.so.13.20 \ No newline at end of file diff --git a/external/lib/linux/x86_64/libfmod.so.13.13 b/external/lib/linux/x86_64/libfmod.so.13.13 deleted file mode 100755 index a6eeab758a..0000000000 Binary files a/external/lib/linux/x86_64/libfmod.so.13.13 and /dev/null differ diff --git a/external/lib/linux/x86_64/libfmod.so.13.20 b/external/lib/linux/x86_64/libfmod.so.13.20 new file mode 100755 index 0000000000..4107c8378c Binary files /dev/null and b/external/lib/linux/x86_64/libfmod.so.13.20 differ diff --git a/external/lib/linux/x86_64/meson.build b/external/lib/linux/x86_64/meson.build index 8fa415314e..f8d36da171 100644 --- a/external/lib/linux/x86_64/meson.build +++ b/external/lib/linux/x86_64/meson.build @@ -1,9 +1,9 @@ cp = find_program('cp') -fmod_so = files('libfmod.so.13.13', 'libfmod.so.13', 'libfmod.so') +fmod_so = files('libfmod.so.13.20', 'libfmod.so.13', 'libfmod.so') if get_option('install_fmod') install_data(fmod_so, install_dir:get_option('fmod_dir'), install_mode:'rwxr-xr-x') endif fmod = compiler.find_library('fmod', dirs: meson.current_source_dir()) -deps += fmod \ No newline at end of file +deps += fmod diff --git a/external/lib/macos/libfmod.dylib b/external/lib/macos/libfmod.dylib index 6576c0d027..14212a2c4c 100644 Binary files a/external/lib/macos/libfmod.dylib and b/external/lib/macos/libfmod.dylib differ diff --git a/external/lib/win/fmod.dll b/external/lib/win/fmod.dll index 901afa640e..a587a823a5 100644 Binary files a/external/lib/win/fmod.dll and b/external/lib/win/fmod.dll differ diff --git a/external/lib/win/fmod_vc.lib b/external/lib/win/fmod_vc.lib index f708333887..a998e595e3 100644 Binary files a/external/lib/win/fmod_vc.lib and b/external/lib/win/fmod_vc.lib differ diff --git a/external/lib/win/x86/fmodL.dll b/external/lib/win/x86/fmodL.dll index c25cb2319c..456116af7e 100644 Binary files a/external/lib/win/x86/fmodL.dll and b/external/lib/win/x86/fmodL.dll differ diff --git a/external/lib/win/x86/fmodL_vc.lib b/external/lib/win/x86/fmodL_vc.lib index 98e249241e..1b588bcb93 100644 Binary files a/external/lib/win/x86/fmodL_vc.lib and b/external/lib/win/x86/fmodL_vc.lib differ diff --git a/external/sources/RakNet/src/FileList.cpp b/external/sources/RakNet/src/FileList.cpp index 1a0f79c765..3e6c618a39 100644 --- a/external/sources/RakNet/src/FileList.cpp +++ b/external/sources/RakNet/src/FileList.cpp @@ -20,7 +20,7 @@ #include -#elif !defined ( __APPLE__ ) && !defined ( __APPLE_CC__ ) && !defined ( __PPC__ ) && !defined ( __FreeBSD__ ) && !defined ( __S3E__ ) +#elif !defined ( __APPLE__ ) && !defined ( __APPLE_CC__ ) && !defined ( __PPC__ ) && !defined ( __FreeBSD__ ) && !defined ( __S3E__ ) && !defined(__aarch64__) #include #endif