Skip to content

gh-115119: Switch Windows build to mpdecimal external #115182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zware merged 5 commits into from
Mar 18, 2024
Merged

gh-115119: Switch Windows build to mpdecimal external #115182

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fc2f57
gh-115119: Switch Windows build to mpdecimal external
zware Feb 8, 2024
0b71ce2
Add mpdecimal.h selection shim
zware Feb 8, 2024
c128618
Define BUILD_LIBMPDEC
zware Feb 25, 2024
7cc95d8
Merge branch 'main' into add_mpdecimal_external
zware Mar 15, 2024
0fce72d
Add mpdecimal to external.spdx.json
zware Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add mpdecimal.h selection shim
  • Loading branch information
@zware
zware committed Feb 25, 2024
commit 0b71ce2c5c6b2e39f102c5e8cc8d0da2b26de729
17 changes: 17 additions & 0 deletions Modules/_decimal/windows/mpdecimal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* Windows mpdecimal.h shim
*
* Generally, the mpdecimal library build will copy the correct header into
* place named "mpdecimal.h", but since we're building it ourselves directly
* into _decimal.pyd, we need to pick the right one.
*
* */

#if defined(_MSC_VER)
#if defined(CONFIG_64)
#include <mpdecimal64vc.h>
#elif defined(CONFIG_32)
#include <mpdecimal32vc.h>
#else
#error "Unknown configuration!"
#endif
#endif
8 changes: 6 additions & 2 deletions PCbuild/_decimal.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;$(mpdecimalDir)\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\windows;$(mpdecimalDir)\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
Expand All @@ -111,7 +111,11 @@
<ClInclude Include="..\Modules\_decimal\docstrings.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\fnt.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\fourstep.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\mpdecimal.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\numbertheory.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\sixstep.h" />
<ClInclude Include="$(mpdecimalDir)\libmpdec\transpose.h" />
Expand Down
8 changes: 7 additions & 1 deletion PCbuild/_decimal.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,13 @@
<ClInclude Include="$(mpdecimalDir)\libmpdec\fourstep.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="$(mpdecimalDir)\libmpdec\mpdecimal.h">
<ClInclude Include="..\Modules\_decimal\windows\mpdecimal.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="$(mpdecimalDir)\libmpdec\mpdecimal32vc.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="$(mpdecimalDir)\libmpdec\mpdecimal64vc.h">
<Filter>Header Files\libmpdec</Filter>
</ClInclude>
<ClInclude Include="$(mpdecimalDir)\libmpdec\numbertheory.h">
Expand Down