Xisco Fauli
241826dcb9
* external/python3/decimal.patch.1 partially reverts commit 849e0716d378d6f9f724d1b3c386f6613d52a49d Author: Zachary Ware <zach@python.org> Date: Mon Mar 18 12:07:25 2024 -0500 gh-115119: Switch Windows build to mpdecimal external (GH-115182) to build mpdecimal as internal on Windows Downloaded from https://www.python.org/ftp/python/3.13.11/Python-3.13.11.tar.xz Change-Id: Ia3385a3cc29f05ba898ec721c7e2a26c9d5f5ac2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195320 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
36 lines
2.4 KiB
Groff
36 lines
2.4 KiB
Groff
--- python3/PCbuild/_decimal.vcxproj 2025-12-11 11:46:52.855511417 +0100
|
|
+++ python3/PCbuild/_decimal.vcxproj 2025-12-11 11:49:35.386244415 +0100
|
|
@@ -98,7 +98,7 @@
|
|
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM'">CONFIG_32;ANSI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM64'">CONFIG_64;ANSI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<PreprocessorDefinitions Condition="'$(Platform)' == 'x64'">CONFIG_64;MASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
- <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\windows;$(mpdecimalDir)\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
+ <AdditionalIncludeDirectories>..\Modules\_decimal;$(mpdecimalDir)\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
</ClCompile>
|
|
</ItemDefinitionGroup>
|
|
<ItemGroup>
|
|
@@ -111,11 +111,7 @@
|
|
<ClInclude Include="..\Modules\_decimal\docstrings.h" />
|
|
<ClInclude Include="$(mpdecimalDir)\libmpdec\fnt.h" />
|
|
<ClInclude Include="$(mpdecimalDir)\libmpdec\fourstep.h" />
|
|
- <ClInclude Include="..\Modules\_decimal\windows\mpdecimal.h" />
|
|
- <ClInclude Condition="'$(Platform)' == 'Win32'" Include="$(mpdecimalDir)\libmpdec\mpdecimal32vc.h" />
|
|
- <ClInclude Condition="'$(Platform)' == 'ARM'" Include="$(mpdecimalDir)\libmpdec\mpdecimal32vc.h" />
|
|
- <ClInclude Condition="'$(Platform)' == 'ARM64'" Include="$(mpdecimalDir)\libmpdec\mpdecimal64vc.h" />
|
|
- <ClInclude Condition="'$(Platform)' == 'x64'" Include="$(mpdecimalDir)\libmpdec\mpdecimal64vc.h" />
|
|
+ <ClInclude Include="$(mpdecimalDir)\libmpdec\mpdecimal.h" />
|
|
<ClInclude Include="$(mpdecimalDir)\libmpdec\numbertheory.h" />
|
|
<ClInclude Include="$(mpdecimalDir)\libmpdec\sixstep.h" />
|
|
<ClInclude Include="$(mpdecimalDir)\libmpdec\transpose.h" />
|
|
--- python3/PCbuild/_decimal.vcxproj.filters 2025-12-11 11:51:56.721607581 +0100
|
|
+++ python3/PCbuild/_decimal.vcxproj.filters 2025-12-11 11:53:18.065393111 +0100
|
|
@@ -45,7 +45,7 @@
|
|
<ClInclude Include="$(mpdecimalDir)\libmpdec\fourstep.h">
|
|
<Filter>Header Files\libmpdec</Filter>
|
|
</ClInclude>
|
|
- <ClInclude Include="..\Modules\_decimal\windows\mpdecimal.h">
|
|
+ <ClInclude Include="$(mpdecimalDir)\libmpdec\mpdecimal.h">
|
|
<Filter>Header Files\libmpdec</Filter>
|
|
</ClInclude>
|
|
<ClInclude Include="$(mpdecimalDir)\libmpdec\mpdecimal32vc.h">
|