diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index d232c01534..901006a0d9 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -153,6 +153,7 @@ ws2_32.lib + /ignore:4221 %(AdditionalOptions) @@ -179,6 +180,7 @@ ws2_32.lib + /ignore:4221 %(AdditionalOptions) @@ -205,6 +207,7 @@ ws2_32.lib + /ignore:4221 %(AdditionalOptions) @@ -232,6 +235,7 @@ ws2_32.lib + /ignore:4221 %(AdditionalOptions) @@ -264,6 +268,7 @@ ws2_32.lib + /ignore:4221 %(AdditionalOptions) @@ -298,6 +303,7 @@ ws2_32.lib + /ignore:4221 %(AdditionalOptions) @@ -332,6 +338,7 @@ ws2_32.lib + /ignore:4221 %(AdditionalOptions) @@ -366,6 +373,7 @@ ws2_32.lib + /ignore:4221 %(AdditionalOptions) diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 25194a1741..1978f3bcac 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -158,6 +158,9 @@ ../git-version.cpp;%(Outputs) Updating git-version.cpp + + /ignore:4221 %(AdditionalOptions) + @@ -183,6 +186,9 @@ ../git-version.cpp;%(Outputs) Updating git-version.cpp + + /ignore:4221 %(AdditionalOptions) + @@ -208,6 +214,9 @@ ../git-version.cpp;%(Outputs) Updating git-version.cpp + + /ignore:4221 %(AdditionalOptions) + @@ -234,6 +243,9 @@ ../git-version.cpp;%(Outputs) Updating git-version.cpp + + /ignore:4221 %(AdditionalOptions) + @@ -260,6 +272,7 @@ %(AdditionalDependencies) + /ignore:4221 %(AdditionalOptions) ../Windows/git-version-gen.cmd @@ -298,6 +311,9 @@ ../git-version.cpp;%(Outputs) Updating git-version.cpp + + /ignore:4221 %(AdditionalOptions) + @@ -330,6 +346,9 @@ ../git-version.cpp;%(Outputs) Updating git-version.cpp + + /ignore:4221 %(AdditionalOptions) + @@ -362,6 +381,9 @@ ../git-version.cpp;%(Outputs) Updating git-version.cpp + + /ignore:4221 %(AdditionalOptions) + diff --git a/GPU/Software/TransformUnit.h b/GPU/Software/TransformUnit.h index b3d2e9b06d..3c022523d2 100644 --- a/GPU/Software/TransformUnit.h +++ b/GPU/Software/TransformUnit.h @@ -180,6 +180,7 @@ public: TransformUnit transformUnit; #if PPSSPP_ARCH(32BIT) +#undef new void *operator new(size_t s) { return AllocateAlignedMemory(s, 16); }