Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 13:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MSBuild: Silence MSVC warning C4324

Browse source
This commit is contained in:
Stenzek 2024-07-06 19:45:08 +10:00
parent eba0794b4f
commit 9a70003b70
No known key found for this signature in database
4 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dep/msvc/vsprops/Base.props
View file

@ -33,6 +33,7 @@
<AdditionalOptions Condition="$(Configuration.Contains(Clang)) And '$(Platform)'=='x64'"> -msse4.1 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions Condition="$(Configuration.Contains(Clang)) And '$(Platform)'=='x64'"> -msse4.1 %(AdditionalOptions)</AdditionalOptions>
<!-- Force ThinLTO for Release builds, MSVC doesn't seem to do it otherwise. --> <!-- Force ThinLTO for Release builds, MSVC doesn't seem to do it otherwise. -->
<AdditionalOptions Condition="$(Configuration.Contains(Clang)) And $(Configuration.Contains(ReleaseLTCG))"> -flto=thin %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions Condition="$(Configuration.Contains(Clang)) And $(Configuration.Contains(ReleaseLTCG))"> -flto=thin %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings Condition="!$(Configuration.Contains(Clang))">4324;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ExceptionHandling>false</ExceptionHandling> <ExceptionHandling>false</ExceptionHandling>
</ClCompile> </ClCompile>
<Link> <Link>

9
src/core/cpu_code_cache_private.h
View file

@ -112,11 +112,6 @@ struct BlockMetadata
BlockFlags flags; BlockFlags flags;
}; };
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4324) // C4324: 'CPU::CodeCache::Block': structure was padded due to alignment specifier)
#endif
struct alignas(16) Block struct alignas(16) Block
{ {
u32 pc; u32 pc;
@ -167,10 +162,6 @@ struct alignas(16) Block
ALWAYS_INLINE bool SpansPages() const { return StartPageIndex() != EndPageIndex(); } ALWAYS_INLINE bool SpansPages() const { return StartPageIndex() != EndPageIndex(); }
}; };
#ifdef _MSC_VER
#pragma warning(pop)
#endif
using BlockLUTArray = std::array<Block**, LUT_TABLE_COUNT>; using BlockLUTArray = std::array<Block**, LUT_TABLE_COUNT>;
struct LoadstoreBackpatchInfo struct LoadstoreBackpatchInfo

8
src/util/audio_stream.h
View file

@ -12,11 +12,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4324) // warning C4324: structure was padded due to alignment specifier
#endif
class Error; class Error;
class SettingsInterface; class SettingsInterface;
@ -380,6 +375,3 @@ void AudioStream::SampleReaderImpl(SampleType* dest, const SampleType* src, u32
} }
} }
#ifdef _MSC_VER
#pragma warning(pop)
#endif

1
src/util/image.cpp
View file

@ -19,7 +19,6 @@
// clang-format off // clang-format off
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4611) // warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable #pragma warning(disable : 4611) // warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable
#pragma warning(disable : 4324) // warning C4324: '`anonymous-namespace'::JPEGErrorHandler': structure was padded due to alignment specifier
#endif #endif
// clang-format on // clang-format on