Merge branch 'dev' into dev
All checks were successful
codespell / Check for spelling errors (pull_request) Successful in 12s
suyu-ci / Check REUSE Specification (pull_request) Successful in 11s
suyu verify / Verify Format (pull_request) Successful in 2m37s
suyu verify / android (pull_request) Successful in 15m57s
suyu verify / test build (linux-fresh, clang) (pull_request) Successful in 17m47s
suyu verify / test build (linux-fresh, linux) (pull_request) Successful in 28m42s

This commit is contained in:
BoomMicrophone 2024-04-01 15:09:57 +02:00
commit 5a92429b8c
2 changed files with 14 additions and 0 deletions

View file

@ -240,6 +240,15 @@ if (MSVC)
)
else()
set_source_files_properties(stb.cpp PROPERTIES COMPILE_OPTIONS "-Wno-implicit-fallthrough;-Wno-missing-declarations;-Wno-missing-field-initializers")
# Get around GCC failing with intrinsics in Debug
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_BUILD_TYPE MATCHES "Debug")
set_property(
SOURCE stb.cpp
APPEND
PROPERTY COMPILE_OPTIONS ";-O2"
)
endif()
endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

View file

@ -425,6 +425,11 @@ else()
# VMA
set_source_files_properties(vulkan_common/vma.cpp PROPERTIES COMPILE_OPTIONS "-Wno-conversion;-Wno-unused-variable;-Wno-unused-parameter;-Wno-missing-field-initializers")
# Get around GCC failing with intrinsics in Debug
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_BUILD_TYPE MATCHES "Debug")
set_source_files_properties(host1x/vic.cpp PROPERTIES COMPILE_OPTIONS "-O2")
endif()
endif()
if (ARCHITECTURE_x86_64)