From 1702c93b308e4f9d009980ccedcf4c3d493daff8 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 3 Aug 2017 04:34:56 -0400 Subject: [PATCH 1/2] Reinstate commit ac513c06f8c80 Even though it breaks AppVeyor worse, its needed that way. Also see https://stackoverflow.com/a/45458443/608639. --- TestScripts/cryptest.vcxproj | 15 +++++++++------ TestScripts/cryptlib.vcxproj | 15 +++++++++------ cryptdll.vcxproj | 14 ++++++++------ cryptest.vcxproj | 15 +++++++++------ cryptlib.vcxproj | 15 +++++++++------ dlltest.vcxproj | 14 ++++++++------ 6 files changed, 52 insertions(+), 36 deletions(-) diff --git a/TestScripts/cryptest.vcxproj b/TestScripts/cryptest.vcxproj index a961cfeb..51623c7d 100644 --- a/TestScripts/cryptest.vcxproj +++ b/TestScripts/cryptest.vcxproj @@ -34,12 +34,7 @@ x64 - - {09cdac08-e6ae-48a9-8de7-0fbc779eebde} - cryptest - $(DefaultPlatformToolset) - Application - + @@ -49,6 +44,14 @@ + + + {09cdac08-e6ae-48a9-8de7-0fbc779eebde} + cryptest + $(DefaultPlatformToolset) + Application + + diff --git a/TestScripts/cryptlib.vcxproj b/TestScripts/cryptlib.vcxproj index b9bdc749..dcc772d7 100644 --- a/TestScripts/cryptlib.vcxproj +++ b/TestScripts/cryptlib.vcxproj @@ -34,12 +34,7 @@ x64 - - {c39f4b46-6e89-4074-902e-ca57073044d2} - cryptlib - $(DefaultPlatformToolset) - StaticLibrary - + @@ -49,6 +44,14 @@ + + + {c39f4b46-6e89-4074-902e-ca57073044d2} + cryptlib + $(DefaultPlatformToolset) + StaticLibrary + + diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj index bbad324b..4b08b90e 100644 --- a/cryptdll.vcxproj +++ b/cryptdll.vcxproj @@ -18,12 +18,7 @@ x64 - - {94a428a1-9ba8-4db2-b76e-bd2e3c08f257} - cryptdll - v100 - DynamicLibrary - + @@ -31,6 +26,13 @@ + + + {94a428a1-9ba8-4db2-b76e-bd2e3c08f257} + cryptdll + v100 + DynamicLibrary + diff --git a/cryptest.vcxproj b/cryptest.vcxproj index 4ff99b48..7a592d0f 100644 --- a/cryptest.vcxproj +++ b/cryptest.vcxproj @@ -34,12 +34,7 @@ x64 - - {09cdac08-e6ae-48a9-8de7-0fbc779eebde} - cryptest - v100 - Application - + @@ -49,6 +44,14 @@ + + + {09cdac08-e6ae-48a9-8de7-0fbc779eebde} + cryptest + v100 + Application + + diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj index eb2ff05b..b0e030ea 100644 --- a/cryptlib.vcxproj +++ b/cryptlib.vcxproj @@ -34,12 +34,7 @@ x64 - - {c39f4b46-6e89-4074-902e-ca57073044d2} - cryptlib - v100 - StaticLibrary - + @@ -49,6 +44,14 @@ + + + {c39f4b46-6e89-4074-902e-ca57073044d2} + cryptlib + v100 + StaticLibrary + + diff --git a/dlltest.vcxproj b/dlltest.vcxproj index c1b61b24..54d985dc 100644 --- a/dlltest.vcxproj +++ b/dlltest.vcxproj @@ -18,18 +18,20 @@ x64 + + + + + + + + {1974a53a-9863-41c9-886d-b2b8c2fc3c8b} dlltest v100 Application - - - - - - From 64c098fbae7de0805cb7cceb245003e5c946e9f3 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 3 Aug 2017 05:22:03 -0400 Subject: [PATCH 2/2] Revert "Reinstate commit ac513c06f8c80" This broke MSbuild, which can no longer build a static library. Attempting to build with 'msbuild /t:Build cryptlib.vcxproj' results in: ... X64\cryptlib\Debug\zinflate.obj X64\cryptlib\Debug\zlib.obj LINK : fatal error LNK1561: entry point must be defined [c:\Users\cryptopp\cryptlib.vcxproj] Done Building Project "c:\Users\Jeff\Desktop\cryptopp\cryptlib.vcxproj" (Build target(s)) -- FAILED. Microsoft tools are so fucked up. It should be illegal to sell them. --- TestScripts/cryptest.vcxproj | 15 ++++++--------- TestScripts/cryptlib.vcxproj | 15 ++++++--------- cryptdll.vcxproj | 14 ++++++-------- cryptest.vcxproj | 15 ++++++--------- cryptlib.vcxproj | 15 ++++++--------- dlltest.vcxproj | 14 ++++++-------- 6 files changed, 36 insertions(+), 52 deletions(-) diff --git a/TestScripts/cryptest.vcxproj b/TestScripts/cryptest.vcxproj index 51623c7d..a961cfeb 100644 --- a/TestScripts/cryptest.vcxproj +++ b/TestScripts/cryptest.vcxproj @@ -34,7 +34,12 @@ x64 - + + {09cdac08-e6ae-48a9-8de7-0fbc779eebde} + cryptest + $(DefaultPlatformToolset) + Application + @@ -44,14 +49,6 @@ - - - {09cdac08-e6ae-48a9-8de7-0fbc779eebde} - cryptest - $(DefaultPlatformToolset) - Application - - diff --git a/TestScripts/cryptlib.vcxproj b/TestScripts/cryptlib.vcxproj index dcc772d7..b9bdc749 100644 --- a/TestScripts/cryptlib.vcxproj +++ b/TestScripts/cryptlib.vcxproj @@ -34,7 +34,12 @@ x64 - + + {c39f4b46-6e89-4074-902e-ca57073044d2} + cryptlib + $(DefaultPlatformToolset) + StaticLibrary + @@ -44,14 +49,6 @@ - - - {c39f4b46-6e89-4074-902e-ca57073044d2} - cryptlib - $(DefaultPlatformToolset) - StaticLibrary - - diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj index 4b08b90e..bbad324b 100644 --- a/cryptdll.vcxproj +++ b/cryptdll.vcxproj @@ -18,7 +18,12 @@ x64 - + + {94a428a1-9ba8-4db2-b76e-bd2e3c08f257} + cryptdll + v100 + DynamicLibrary + @@ -26,13 +31,6 @@ - - - {94a428a1-9ba8-4db2-b76e-bd2e3c08f257} - cryptdll - v100 - DynamicLibrary - diff --git a/cryptest.vcxproj b/cryptest.vcxproj index 7a592d0f..4ff99b48 100644 --- a/cryptest.vcxproj +++ b/cryptest.vcxproj @@ -34,7 +34,12 @@ x64 - + + {09cdac08-e6ae-48a9-8de7-0fbc779eebde} + cryptest + v100 + Application + @@ -44,14 +49,6 @@ - - - {09cdac08-e6ae-48a9-8de7-0fbc779eebde} - cryptest - v100 - Application - - diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj index b0e030ea..eb2ff05b 100644 --- a/cryptlib.vcxproj +++ b/cryptlib.vcxproj @@ -34,7 +34,12 @@ x64 - + + {c39f4b46-6e89-4074-902e-ca57073044d2} + cryptlib + v100 + StaticLibrary + @@ -44,14 +49,6 @@ - - - {c39f4b46-6e89-4074-902e-ca57073044d2} - cryptlib - v100 - StaticLibrary - - diff --git a/dlltest.vcxproj b/dlltest.vcxproj index 54d985dc..c1b61b24 100644 --- a/dlltest.vcxproj +++ b/dlltest.vcxproj @@ -18,20 +18,18 @@ x64 - - - - - - - - {1974a53a-9863-41c9-886d-b2b8c2fc3c8b} dlltest v100 Application + + + + + +