From 28d01062f62de1218d511c4574da4006f92be3bd Mon Sep 17 00:00:00 2001 From: Brian Gladman Date: Wed, 12 Oct 2022 09:56:33 +0100 Subject: [PATCH 1/4] Add HAVE_VSNPRINTF to the MPIR config file --- msvc/cfg.h | 1 + 1 file changed, 1 insertion(+) diff --git a/msvc/cfg.h b/msvc/cfg.h index 9cb53e6f..ad76569e 100644 --- a/msvc/cfg.h +++ b/msvc/cfg.h @@ -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) ")" From 31cd09b34933127f396a118c774a702276d4c3a5 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Fri, 6 Jan 2023 00:38:21 +0100 Subject: [PATCH 2/4] removing last piece of PROTO follow-up to c7567b5ad96e994acd3fd81a2d9b9eff93742c1b --- gmp-h.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/gmp-h.in b/gmp-h.in index e8c6d920..f8b2310c 100644 --- a/gmp-h.in +++ b/gmp-h.in @@ -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 From 4d3b0e4759376993aece3feac6748600d25ef939 Mon Sep 17 00:00:00 2001 From: Brian Gladman Date: Wed, 8 Feb 2023 22:27:51 +0000 Subject: [PATCH 3/4] remove local props item --- msvc/vs22/test-config.props | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 msvc/vs22/test-config.props diff --git a/msvc/vs22/test-config.props b/msvc/vs22/test-config.props deleted file mode 100644 index 0e21ade8..00000000 --- a/msvc/vs22/test-config.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - ..\..\lib_mpir_skylake_avx\x64\Release\ - ..\..\lib_mpir_skylake_avx\x64\Release\mpir.lib;..\..\lib_mpir_cxx\x64\Release\mpirxx.lib - - - - MultiThreaded - $(MPDIR);$(SolutionDir)..\..\tests - - - $(MPLIBS);$(OutDir)\add-test-lib.lib;%(AdditionalDependencies) - - - - - $(MPDIR) - true - - - $(MPLIBS) - true - - - From dc82b0475dea84d5338356e49176c40be03a5bdf Mon Sep 17 00:00:00 2001 From: Brian Gladman Date: Thu, 9 Feb 2023 22:23:31 +0000 Subject: [PATCH 4/4] update visual studio tool version numbers --- msvc/vs22/dll_mpir_gc/dll_mpir_gc.vcxproj | 8 ++++---- .../dll_mpir_skylake_avx.vcxproj | 10 +++++----- msvc/vs22/lib_mpir_cxx/lib_mpir_cxx.vcxproj | 8 ++++---- msvc/vs22/lib_mpir_gc/lib_mpir_gc.vcxproj | 8 ++++---- .../lib_mpir_skylake_avx.vcxproj | 16 +++++++--------- msvc/vs22/mpir.sln | 2 +- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/msvc/vs22/dll_mpir_gc/dll_mpir_gc.vcxproj b/msvc/vs22/dll_mpir_gc/dll_mpir_gc.vcxproj index 2ff2f977..0f10c99a 100644 --- a/msvc/vs22/dll_mpir_gc/dll_mpir_gc.vcxproj +++ b/msvc/vs22/dll_mpir_gc/dll_mpir_gc.vcxproj @@ -1,5 +1,5 @@ - + Release @@ -686,7 +686,7 @@ postbuild "$(TargetPath)" 22 - + - - \ No newline at end of file + + diff --git a/msvc/vs22/dll_mpir_skylake_avx/dll_mpir_skylake_avx.vcxproj b/msvc/vs22/dll_mpir_skylake_avx/dll_mpir_skylake_avx.vcxproj index ffb7edb1..7603354a 100644 --- a/msvc/vs22/dll_mpir_skylake_avx/dll_mpir_skylake_avx.vcxproj +++ b/msvc/vs22/dll_mpir_skylake_avx/dll_mpir_skylake_avx.vcxproj @@ -1,5 +1,5 @@ - + Release @@ -652,8 +652,8 @@ postbuild "$(TargetPath)" 22 - - + + - - \ No newline at end of file + + diff --git a/msvc/vs22/lib_mpir_cxx/lib_mpir_cxx.vcxproj b/msvc/vs22/lib_mpir_cxx/lib_mpir_cxx.vcxproj index 89e5c422..0aca0c6e 100644 --- a/msvc/vs22/lib_mpir_cxx/lib_mpir_cxx.vcxproj +++ b/msvc/vs22/lib_mpir_cxx/lib_mpir_cxx.vcxproj @@ -1,5 +1,5 @@ - + Release @@ -141,7 +141,7 @@ postbuild "$(TargetPath)" 22 - + - - \ No newline at end of file + + diff --git a/msvc/vs22/lib_mpir_gc/lib_mpir_gc.vcxproj b/msvc/vs22/lib_mpir_gc/lib_mpir_gc.vcxproj index 961a80b3..350ee110 100644 --- a/msvc/vs22/lib_mpir_gc/lib_mpir_gc.vcxproj +++ b/msvc/vs22/lib_mpir_gc/lib_mpir_gc.vcxproj @@ -1,5 +1,5 @@ - + Release @@ -667,7 +667,7 @@ postbuild "$(TargetPath)" 22 - + - - \ No newline at end of file + + diff --git a/msvc/vs22/lib_mpir_skylake_avx/lib_mpir_skylake_avx.vcxproj b/msvc/vs22/lib_mpir_skylake_avx/lib_mpir_skylake_avx.vcxproj index 27734ec3..d2a73c25 100644 --- a/msvc/vs22/lib_mpir_skylake_avx/lib_mpir_skylake_avx.vcxproj +++ b/msvc/vs22/lib_mpir_skylake_avx/lib_mpir_skylake_avx.vcxproj @@ -1,5 +1,5 @@ - + Release @@ -52,8 +52,7 @@ prebuild skylake\avx x64 22 - - + ..\..\..\mpn\x86_64w\ true $(IntDir)mpn\%(FileName).obj @@ -76,8 +75,7 @@ prebuild skylake\avx x64 22 - - + ..\..\..\mpn\x86_64w\ true $(IntDir)mpn\%(FileName).obj @@ -639,8 +637,8 @@ postbuild "$(TargetPath)" 22 - - + + - - \ No newline at end of file + + diff --git a/msvc/vs22/mpir.sln b/msvc/vs22/mpir.sln index aff1d304..d46e8919 100644 --- a/msvc/vs22/mpir.sln +++ b/msvc/vs22/mpir.sln @@ -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