From 0ad1b1234eea41dd8e6f75daebbd2fceb8aa007f Mon Sep 17 00:00:00 2001 From: Coia Prant Date: Mon, 9 Jun 2025 01:28:25 +0800 Subject: [PATCH] chore: drop 32-bit and add more x86_64 check (#3938) Signed-off-by: Coia Prant --- src/platform/windows/audio.cpp | 4 +--- src/rswrapper.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/platform/windows/audio.cpp b/src/platform/windows/audio.cpp index 7c38b1bc..20e600ac 100644 --- a/src/platform/windows/audio.cpp +++ b/src/platform/windows/audio.cpp @@ -27,10 +27,8 @@ DEFINE_PROPERTYKEY(PKEY_Device_DeviceDesc, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x2 DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); // DEVPROP_TYPE_STRING DEFINE_PROPERTYKEY(PKEY_DeviceInterface_FriendlyName, 0x026e516e, 0xb814, 0x414b, 0x83, 0xcd, 0x85, 0x6d, 0x6f, 0xef, 0x48, 0x22, 2); -#if defined(__x86_64) || defined(_M_AMD64) +#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) #define STEAM_DRIVER_SUBDIR L"x64" -#elif defined(__i386) || defined(_M_IX86) - #define STEAM_DRIVER_SUBDIR L"x86" #else #warning No known Steam audio driver for this architecture #endif diff --git a/src/rswrapper.c b/src/rswrapper.c index 953ba477..53069620 100644 --- a/src/rswrapper.c +++ b/src/rswrapper.c @@ -39,7 +39,7 @@ #define gemm DECORATE_FUNC(gemm, ISA_SUFFIX) #define invert_mat DECORATE_FUNC(invert_mat, ISA_SUFFIX) -#if defined(__x86_64__) || defined(__i386__) +#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) // Compile a variant for SSSE3 #if defined(__clang__) @@ -122,7 +122,7 @@ reed_solomon_decode_t reed_solomon_decode_fn; * @details The streaming code will directly invoke these function pointers during encoding. */ void reed_solomon_init(void) { -#if defined(__x86_64__) || defined(__i386__) +#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) if (__builtin_cpu_supports("avx512f") && __builtin_cpu_supports("avx512bw")) { reed_solomon_new_fn = reed_solomon_new_avx512; reed_solomon_release_fn = reed_solomon_release_avx512;