Merge branch 'master' into rho-fork

This commit is contained in:
Cheng 2023-02-27 07:56:48 +08:00
commit bc42eee0b5
No known key found for this signature in database
GPG Key ID: 571C3A9C3B9E6FCA
8 changed files with 25 additions and 26 deletions

View File

@ -107,11 +107,9 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
|| defined (_MSC_VER) \
|| defined (_WIN32)
#define __GMP_HAVE_CONST 1
#define __GMP_HAVE_PROTOTYPES 1
#define __GMP_HAVE_TOKEN_PASTE 1
#else
#define __GMP_HAVE_CONST 0
#define __GMP_HAVE_PROTOTYPES 0
#define __GMP_HAVE_TOKEN_PASTE 0
#endif

View File

@ -358,6 +358,7 @@ MA 02111-1307, USA. */
#define alloca _alloca
#define HAVE_STRCASECMP 1
#define HAVE_STRNCASECMP 1
#define HAVE_VSNPRINTF 1
#define MSC_C_(x) #x
#define MSC_CC_(x) MSC_C_(x)
#define MSC_VERSION "Microsoft C++ (Version " MSC_CC_(_MSC_FULL_VER) ")"

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0.25914.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="19.30.30401" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
@ -690,7 +690,7 @@ postbuild "$(TargetPath)" 22
<ItemGroup>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ItemGroup>
<ItemGroup>
<None Include="..\..\..\gmp-h.in" />
</ItemGroup>
</ItemGroup>
</Project>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0.25914.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="19.30.30401" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
@ -652,8 +652,8 @@ postbuild "$(TargetPath)" 22
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\vsyasm.targets" />
</ImportGroup>
<ItemGroup>
</ImportGroup>
<ItemGroup>
<None Include="..\..\..\gmp-h.in" />
</ItemGroup>
</Project>
</ItemGroup>
</Project>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0.25914.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="19.30.30401" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
@ -145,7 +145,8 @@ postbuild "$(TargetPath)" 22
<ItemGroup>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ItemGroup>
<ItemGroup>
<None Include="..\..\..\gmp-h.in" />
</ItemGroup>
</ItemGroup>
</Project>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0.25914.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="19.30.30401" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
@ -671,7 +671,8 @@ postbuild "$(TargetPath)" 22
<ItemGroup>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ItemGroup>
<ItemGroup>
<None Include="..\..\..\gmp-h.in" />
</ItemGroup>
</ItemGroup>
</Project>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0.25914.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="19.30.30401" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
@ -52,8 +52,7 @@ prebuild skylake\avx x64 22
</Command>
</PreBuildEvent>
<YASM>
<Defines>
</Defines>
<Defines></Defines>
<IncludePaths>..\..\..\mpn\x86_64w\</IncludePaths>
<Debug>true</Debug>
<ObjectFile>$(IntDir)mpn\%(FileName).obj</ObjectFile>
@ -76,8 +75,7 @@ prebuild skylake\avx x64 22
</Command>
</PreBuildEvent>
<YASM>
<Defines>
</Defines>
<Defines></Defines>
<IncludePaths>..\..\..\mpn\x86_64w\</IncludePaths>
<Debug>true</Debug>
<ObjectFile>$(IntDir)mpn\%(FileName).obj</ObjectFile>
@ -639,8 +637,8 @@ postbuild "$(TargetPath)" 22
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\vsyasm.targets" />
</ImportGroup>
<ItemGroup>
</ImportGroup>
<ItemGroup>
<None Include="..\..\..\gmp-h.in" />
</ItemGroup>
</Project>
</ItemGroup>
</Project>

View File

@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 22
VisualStudioVersion = 19.20.27027.1
VisualStudioVersion = 19.30.30401
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dll_mpir_gc", "dll_mpir_gc\dll_mpir_gc.vcxproj", "{6322DE11-2109-42FA-9179-333322FE30C6}"
EndProject