Fix for build issue with MinGW 13.2 (#420)

This commit is contained in:
Chuck Walbourn 2024-01-06 17:41:22 -08:00 коммит произвёл GitHub
Родитель b34757e7b8
Коммит 17ef23bc43
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 27 добавлений и 1 удалений

Просмотреть файл

@ -56,6 +56,14 @@ elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]$")
set(DIRECTX_ARCH arm)
elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]64$")
set(DIRECTX_ARCH arm64)
elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Ww][Ii][Nn]32$")
set(DIRECTX_ARCH x86)
elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Xx]64$")
set(DIRECTX_ARCH x64)
elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]$")
set(DIRECTX_ARCH arm)
elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64$")
set(DIRECTX_ARCH arm64)
endif()
include(GNUInstallDirs)
@ -446,7 +454,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
endforeach()
elseif(MINGW)
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
target_compile_options(${t} PRIVATE -Wno-ignored-attributes)
target_compile_options(${t} PRIVATE "-Wno-ignored-attributes" "-Walloc-size-larger-than=4GB")
target_link_options(${t} PRIVATE -municode)
endforeach()
elseif( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )

Просмотреть файл

@ -566,6 +566,8 @@ namespace DirectX
SkinnedDGSLEffect(SkinnedDGSLEffect const&) = delete;
SkinnedDGSLEffect& operator= (SkinnedDGSLEffect const&) = delete;
~SkinnedDGSLEffect() override;
// Animation setting.
void __cdecl SetWeightsPerVertex(int value) override;
void __cdecl SetBoneTransforms(_In_reads_(count) XMMATRIX const* value, size_t count) override;
@ -667,6 +669,8 @@ namespace DirectX
SkinnedNormalMapEffect(SkinnedNormalMapEffect const&) = delete;
SkinnedNormalMapEffect& operator= (SkinnedNormalMapEffect const&) = delete;
~SkinnedNormalMapEffect() override;
// Animation settings.
void __cdecl SetWeightsPerVertex(int value) override;
void __cdecl SetBoneTransforms(_In_reads_(count) XMMATRIX const* value, size_t count) override;
@ -773,6 +777,8 @@ namespace DirectX
SkinnedPBREffect(SkinnedPBREffect const&) = delete;
SkinnedPBREffect& operator= (SkinnedPBREffect const&) = delete;
~SkinnedPBREffect() override;
// Animation settings.
void __cdecl SetWeightsPerVertex(int value) override;
void __cdecl SetBoneTransforms(_In_reads_(count) XMMATRIX const* value, size_t count) override;

Просмотреть файл

@ -899,6 +899,10 @@ void DGSLEffect::SetTexture(int whichTexture, _In_opt_ ID3D11ShaderResourceView*
// SkinnedDGSLEffect
//--------------------------------------------------------------------------------------
SkinnedDGSLEffect::~SkinnedDGSLEffect()
{
}
// Animation settings.
void SkinnedDGSLEffect::SetWeightsPerVertex(int value)
{

Просмотреть файл

@ -690,6 +690,10 @@ void NormalMapEffect::SetInstancingEnabled(bool value)
// SkinnedNormalMapEffect
//--------------------------------------------------------------------------------------
SkinnedNormalMapEffect::~SkinnedNormalMapEffect()
{
}
// Animation settings.
void SkinnedNormalMapEffect::SetWeightsPerVertex(int value)
{

Просмотреть файл

@ -682,6 +682,10 @@ void PBREffect::SetRenderTargetSizeInPixels(int width, int height)
// SkinnedPBREffect
//--------------------------------------------------------------------------------------
SkinnedPBREffect::~SkinnedPBREffect()
{
}
// Animation settings.
void SkinnedPBREffect::SetWeightsPerVertex(int value)
{