summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2020-08-10 20:39:46 (GMT)
committerGitHub <noreply@github.com>2020-08-10 20:39:46 (GMT)
commita02efe4d27c2aaa4af0cfaf87efa2146b677b17d (patch)
tree229974d52a52ada6cc4643044df77bb8fb3ac7a6
parent85fdafa6ea933aa0623f5d8297ab0f4b20866234 (diff)
downloadcpython-a02efe4d27c2aaa4af0cfaf87efa2146b677b17d.zip
cpython-a02efe4d27c2aaa4af0cfaf87efa2146b677b17d.tar.gz
cpython-a02efe4d27c2aaa4af0cfaf87efa2146b677b17d.tar.bz2
MSVC: The ARM command line should not define MASM. (#21817)
-rw-r--r--PCbuild/_decimal.vcxproj6
1 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj
index 4c71cdb..0916f1a 100644
--- a/PCbuild/_decimal.vcxproj
+++ b/PCbuild/_decimal.vcxproj
@@ -93,11 +93,11 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Platform)' == 'Win32'">CONFIG_32;PPRO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Platform)' == 'Win32'">CONFIG_32;PPRO;MASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM'">CONFIG_32;ANSI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM64'">CONFIG_64;ANSI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Platform)' == 'x64'">CONFIG_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Platform)' == 'x64'">CONFIG_64;MASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>