From 55f0c12ae6defd4db90281c473ee57c6e93406d1 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 27 Feb 2023 13:35:05 -0800 Subject: [PATCH] Fix arm64 warning --- XAudio2/XAudio2CustomAPO/CMakeLists.txt | 4 ++-- XAudio2/XAudio2CustomAPO/CMakePresets.json | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/XAudio2/XAudio2CustomAPO/CMakeLists.txt b/XAudio2/XAudio2CustomAPO/CMakeLists.txt index 92b3a560..8534667a 100644 --- a/XAudio2/XAudio2CustomAPO/CMakeLists.txt +++ b/XAudio2/XAudio2CustomAPO/CMakeLists.txt @@ -104,8 +104,8 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) "-Wno-unused-const-variable" "-Wno-extra-semi-stmt") elseif( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" ) target_compile_options(${PROJECT_NAME} PRIVATE - /sdl /permissive- /Zc:__cplusplus /Zc:inline - "/wd4061" "/wd4365" "/wd4514" "/wd4571" "/wd4668" "/wd4710" "/wd4820" "/wd5039" "/wd5045") + /sdl /permissive- /Zc:__cplusplus /Zc:inline /volatile:ms + "/wd4061" "/wd4365" "/wd4514" "/wd4571" "/wd4668" "/wd4710" "/wd4746" "/wd4820" "/wd5039" "/wd5045") if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24) target_compile_options(${PROJECT_NAME} PRIVATE /ZH:SHA_256) diff --git a/XAudio2/XAudio2CustomAPO/CMakePresets.json b/XAudio2/XAudio2CustomAPO/CMakePresets.json index 748421ca..2ec8e94b 100644 --- a/XAudio2/XAudio2CustomAPO/CMakePresets.json +++ b/XAudio2/XAudio2CustomAPO/CMakePresets.json @@ -119,17 +119,17 @@ { "name": "x86-Debug" , "description": "MSVC for x86 (Debug)", "inherits": [ "base", "x86", "Debug", "MSVC", "VCPKG" ] }, { "name": "x86-Release" , "description": "MSVC for x86 (Release)", "inherits": [ "base", "x86", "Release", "MSVC", "VCPKG" ] }, - { "name": "x64-Debug-Win8" , "description": "MSVC for x64 (Debug)", "inherits": [ "base", "x64", "Debug", "MSVC", "Win8" ] }, - { "name": "x64-Release-Win8" , "description": "MSVC for x64 (Release)", "inherits": [ "base", "x64", "Release", "MSVC", "Win8" ] }, - { "name": "x86-Debug-Win8" , "description": "MSVC for x86 (Debug)", "inherits": [ "base", "x86", "Debug", "MSVC", "Win8" ] }, - { "name": "x86-Release-Win8" , "description": "MSVC for x86 (Release)", "inherits": [ "base", "x86", "Release", "MSVC", "Win8" ] }, + { "name": "x64-Debug-Win8" , "description": "MSVC for x64 (Debug)", "inherits": [ "base", "x64", "Debug", "MSVC", "VCPKG", "Win8" ] }, + { "name": "x64-Release-Win8" , "description": "MSVC for x64 (Release)", "inherits": [ "base", "x64", "Release", "MSVC", "VCPKG", "Win8" ] }, + { "name": "x86-Debug-Win8" , "description": "MSVC for x86 (Debug)", "inherits": [ "base", "x86", "Debug", "MSVC", "VCPKG", "Win8" ] }, + { "name": "x86-Release-Win8" , "description": "MSVC for x86 (Release)", "inherits": [ "base", "x86", "Release", "MSVC", "VCPKG", "Win8" ] }, - { "name": "x64-Debug-Win10" , "description": "MSVC for x64 (Debug)", "inherits": [ "base", "x64", "Debug", "MSVC", "Win10" ] }, - { "name": "x64-Release-Win10" , "description": "MSVC for x64 (Release)", "inherits": [ "base", "x64", "Release", "MSVC", "Win10" ] }, - { "name": "x86-Debug-Win10" , "description": "MSVC for x86 (Debug)", "inherits": [ "base", "x86", "Debug", "MSVC", "Win10" ] }, - { "name": "x86-Release-Win10" , "description": "MSVC for x86 (Release)", "inherits": [ "base", "x86", "Release", "MSVC", "Win10" ] }, - { "name": "arm64-Debug-Win10" , "description": "MSVC for ARM64 (Debug) for Windows 10", "inherits": [ "base", "ARM64", "Debug", "MSVC", "Win10" ] }, - { "name": "arm64-Release-Win10", "description": "MSVC for ARM64 (Release) for Windows 10", "inherits": [ "base", "ARM64", "Release", "MSVC", "Win10" ] }, + { "name": "x64-Debug-Win10" , "description": "MSVC for x64 (Debug)", "inherits": [ "base", "x64", "Debug", "MSVC", "VCPKG", "Win10" ] }, + { "name": "x64-Release-Win10" , "description": "MSVC for x64 (Release)", "inherits": [ "base", "x64", "Release", "MSVC", "VCPKG", "Win10" ] }, + { "name": "x86-Debug-Win10" , "description": "MSVC for x86 (Debug)", "inherits": [ "base", "x86", "Debug", "MSVC", "VCPKG", "Win10" ] }, + { "name": "x86-Release-Win10" , "description": "MSVC for x86 (Release)", "inherits": [ "base", "x86", "Release", "MSVC", "VCPKG", "Win10" ] }, + { "name": "arm64-Debug-Win10" , "description": "MSVC for ARM64 (Debug) for Windows 10", "inherits": [ "base", "ARM64", "Debug", "MSVC", "VCPKG", "Win10" ] }, + { "name": "arm64-Release-Win10", "description": "MSVC for ARM64 (Release) for Windows 10", "inherits": [ "base", "ARM64", "Release", "MSVC", "VCPKG", "Win10" ] }, { "name": "x64-Debug-Clang" , "description": "Clang/LLVM for x64 (Debug)", "inherits": [ "base", "x64", "Debug", "Clang", "VCPKG" ] }, { "name": "x64-Release-Clang" , "description": "Clang/LLVM for x64 (Release)", "inherits": [ "base", "x64", "Release", "Clang", "VCPKG" ] },