summaryrefslogtreecommitdiff
path: root/TestScripts
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2017-08-03 05:22:03 -0400
committerJeffrey Walton <noloader@gmail.com>2017-08-03 05:22:03 -0400
commit64c098fbae7de0805cb7cceb245003e5c946e9f3 (patch)
treec4dee504eee5ac80f77ea4eaf0f85f5081e278d5 /TestScripts
parent1702c93b308e4f9d009980ccedcf4c3d493daff8 (diff)
downloadcryptopp-git-64c098fbae7de0805cb7cceb245003e5c946e9f3.tar.gz
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.
Diffstat (limited to 'TestScripts')
-rw-r--r--TestScripts/cryptest.vcxproj15
-rw-r--r--TestScripts/cryptlib.vcxproj15
2 files changed, 12 insertions, 18 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 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
- <!-- Relocated by JW in AUG 2017 -->
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>
+ <RootNamespace>cryptest</RootNamespace>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ <ConfigurationType>Application</ConfigurationType>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -44,14 +49,6 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <!-- Global property group must follow imports due to PlatformToolset -->
- <PropertyGroup Label="Globals">
- <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>
- <RootNamespace>cryptest</RootNamespace>
- <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
- <ConfigurationType>Application</ConfigurationType>
- </PropertyGroup>
- <PropertyGroup Label="UserMacros" />
<!-- End of Visual Studio boilerplate -->
<!-- All Configurations -->
<PropertyGroup Label="All Configurations">
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 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
- <!-- Relocated by JW in AUG 2017 -->
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{c39f4b46-6e89-4074-902e-ca57073044d2}</ProjectGuid>
+ <RootNamespace>cryptlib</RootNamespace>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -44,14 +49,6 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <!-- Global property group must follow imports due to PlatformToolset -->
- <PropertyGroup Label="Globals">
- <ProjectGuid>{c39f4b46-6e89-4074-902e-ca57073044d2}</ProjectGuid>
- <RootNamespace>cryptlib</RootNamespace>
- <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
- <ConfigurationType>StaticLibrary</ConfigurationType>
- </PropertyGroup>
- <PropertyGroup Label="UserMacros" />
<!-- End of Visual Studio boilerplate -->
<!-- All Configurations -->
<PropertyGroup Label="All Configurations">