[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated (d9506b7d -> fbe1ba9d
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated (d9506b7d -> fbe1ba9d) |
|
Date: |
Sun, 21 Apr 2019 14:04:22 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a change to branch master
in repository libmicrohttpd.
from d9506b7d Headers: better compatibility with MSVC compiler
new 9e68caa3 MSVC: Added project for VS2019
new fbe1ba9d mhd_bithelpers.h: used MSVC built-ins to speed-up VC-compiled
code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/microhttpd/mhd_bithelpers.h | 55 +++++++++++++--
w32/{VS2017 => VS2019}/.gitignore | 0
w32/{VS2017 => VS2019}/hellobrowser.vcxproj | 5 +-
.../hellobrowser.vcxproj.filters | 0
w32/{VS2017 => VS2019}/largepost.vcxproj | 2 +-
w32/{VS2017 => VS2019}/libmicrohttpd.sln | 78 +---------------------
.../libmicrohttpd.vcxproj} | 17 ++---
.../libmicrohttpd.vcxproj.filters | 0
w32/{VS2017 => VS2019}/simplepost.vcxproj | 4 +-
9 files changed, 66 insertions(+), 95 deletions(-)
copy w32/{VS2017 => VS2019}/.gitignore (100%)
copy w32/{VS2017 => VS2019}/hellobrowser.vcxproj (94%)
copy w32/{VS2013 => VS2019}/hellobrowser.vcxproj.filters (100%)
copy w32/{VS2017 => VS2019}/largepost.vcxproj (98%)
copy w32/{VS2017 => VS2019}/libmicrohttpd.sln (53%)
copy w32/{VS2017/hellobrowser.vcxproj => VS2019/libmicrohttpd.vcxproj} (81%)
copy w32/{VS2013 => VS2019}/libmicrohttpd.vcxproj.filters (100%)
copy w32/{VS2017 => VS2019}/simplepost.vcxproj (94%)
diff --git a/src/microhttpd/mhd_bithelpers.h b/src/microhttpd/mhd_bithelpers.h
index 6c4f0fea..caa24846 100644
--- a/src/microhttpd/mhd_bithelpers.h
+++ b/src/microhttpd/mhd_bithelpers.h
@@ -28,24 +28,52 @@
#include "mhd_byteorder.h"
#include <stdint.h>
+#if defined(_MSC_FULL_VER) && (!defined(__clang__) || (defined(__c2__) &&
defined(__OPTIMIZE__)))
+/* Declarations for VC & Clang/C2 built-ins */
+#include <intrin.h>
+#endif /* _MSC_FULL_VER */
+
+#ifndef __has_builtin
+/* Avoid precompiler errors with non-clang */
+# define __has_builtin(x) 0
+#endif
#ifdef MHD_HAVE___BUILTIN_BSWAP32
#define _MHD_BYTES_SWAP32(value32) \
((uint32_t)__builtin_bswap32((uint32_t)value32))
-#else /* ! MHD_HAVE___BUILTIN_BSWAP32 */
+#elif defined(_MSC_FULL_VER) && (!defined(__clang__) || (defined(__c2__) &&
defined(__OPTIMIZE__)))
+/* Clang/C2 may not inline this function if optimizations are turned off. */
+#ifndef __clang__
+#pragma intrinsic(_byteswap_ulong)
+#endif /* ! __clang__ */
+#define _MHD_BYTES_SWAP32(value32) \
+ ((uint32_t)_byteswap_ulong((uint32_t)value32))
+#elif __has_builtin(__builtin_bswap32)
+#define _MHD_BYTES_SWAP32(value32) \
+ ((uint32_t)__builtin_bswap32((uint32_t)value32))
+#else /* ! __has_builtin(__builtin_bswap32) */
#define _MHD_BYTES_SWAP32(value32) \
( (((uint32_t)(value32)) << 24) | \
((((uint32_t)(value32)) & ((uint32_t)0x0000FF00)) << 8) | \
((((uint32_t)(value32)) & ((uint32_t)0x00FF0000)) >> 8) | \
(((uint32_t)(value32)) >> 24) )
-#endif /* ! MHD_HAVE___BUILTIN_BSWAP32 */
-
+#endif /* ! __has_builtin(__builtin_bswap32) */
#ifdef MHD_HAVE___BUILTIN_BSWAP64
#define _MHD_BYTES_SWAP64(value64) \
((uint64_t)__builtin_bswap64((uint64_t)value64))
-#else /* ! MHD_HAVE___BUILTIN_BSWAP64 */
+#elif defined(_MSC_FULL_VER) && (!defined(__clang__) || (defined(__c2__) &&
defined(__OPTIMIZE__)))
+/* Clang/C2 may not inline this function if optimizations are turned off. */
+#ifndef __clang__
+#pragma intrinsic(_byteswap_uint64)
+#endif /* ! __clang__ */
+#define _MHD_BYTES_SWAP64(value64) \
+ ((uint64_t)_byteswap_uint64((uint64_t)value64))
+#elif __has_builtin(__builtin_bswap64)
+#define _MHD_BYTES_SWAP64(value64) \
+ ((uint64_t)__builtin_bswap64((uint64_t)value64))
+#else /* ! __has_builtin(__builtin_bswap64) */
#define _MHD_BYTES_SWAP64(value64) \
( (((uint64_t)(value64)) << 56) | \
((((uint64_t)(value64)) & ((uint64_t)0x000000000000FF00)) << 40) | \
@@ -55,7 +83,8 @@
((((uint64_t)(value64)) & ((uint64_t)0x0000FF0000000000)) >> 24) | \
((((uint64_t)(value64)) & ((uint64_t)0x00FF000000000000)) >> 40) | \
(((uint64_t)(value64)) >> 56) )
-#endif /* ! MHD_HAVE___BUILTIN_BSWAP64 */
+#endif /* ! __has_builtin(__builtin_bswap64) */
+
/* _MHD_PUT_64BIT_LE (addr, value64)
* put native-endian 64-bit value64 to addr
@@ -184,11 +213,23 @@
((uint32_t) (((uint8_t*)addr)[3])) )
#endif /* _MHD_BYTE_ORDER != _MHD_LITTLE_ENDIAN */
+
/**
* Rotate right 32-bit value by number of bits.
* bits parameter must be more than zero and must be less than 32.
- * Defined in form which modern compiler could optimize.
*/
-#define _MHD_ROTR32(value32, bits) ((value32) >> (bits) | (value32) << (32 -
bits))
+#if defined(_MSC_FULL_VER) && (!defined(__clang__) || (defined(__c2__) &&
defined(__OPTIMIZE__)))
+/* Clang/C2 do not inline this function if optimizations are turned off. */
+#ifndef __clang__
+#pragma intrinsic(_rotr)
+#endif /* ! __clang__ */
+#define _MHD_ROTR32(value32, bits) \
+ ((uint32_t)_rotr((uint32_t)(value32),(bits)))
+#else /* ! _MSC_FULL_VER */
+/* Defined in form which modern compiler could optimize. */
+#define _MHD_ROTR32(value32, bits) \
+ (((uint32_t)(value32)) >> (bits) | ((uint32_t)(value32)) << (32 -
bits))
+#endif /* ! _MSC_FULL_VER */
+
#endif /* ! MHD_BITHELPERS_H */
diff --git a/w32/VS2017/.gitignore b/w32/VS2019/.gitignore
similarity index 100%
copy from w32/VS2017/.gitignore
copy to w32/VS2019/.gitignore
diff --git a/w32/VS2017/hellobrowser.vcxproj b/w32/VS2019/hellobrowser.vcxproj
similarity index 94%
copy from w32/VS2017/hellobrowser.vcxproj
copy to w32/VS2019/hellobrowser.vcxproj
index ed29e613..415f65ca 100644
--- a/w32/VS2017/hellobrowser.vcxproj
+++ b/w32/VS2019/hellobrowser.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<Import Project="$(SolutionDir)..\common\vs_dirs.props" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug-dll|Win32">
@@ -37,6 +37,7 @@
</ItemGroup>
<Import Project="$(MhdW32Common)\hellobrowser-files.vcxproj" />
<PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>hellobrowser</RootNamespace>
@@ -49,7 +50,7 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries
Condition="$(Configuration.StartsWith('Debug'))">true</UseDebugLibraries>
<UseDebugLibraries Condition="!
$(Configuration.StartsWith('Debug'))">false</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization Condition="!
$(Configuration.StartsWith('Debug'))">true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
diff --git a/w32/VS2013/hellobrowser.vcxproj.filters
b/w32/VS2019/hellobrowser.vcxproj.filters
similarity index 100%
copy from w32/VS2013/hellobrowser.vcxproj.filters
copy to w32/VS2019/hellobrowser.vcxproj.filters
diff --git a/w32/VS2017/largepost.vcxproj b/w32/VS2019/largepost.vcxproj
similarity index 98%
copy from w32/VS2017/largepost.vcxproj
copy to w32/VS2019/largepost.vcxproj
index c9141f82..4038153a 100644
--- a/w32/VS2017/largepost.vcxproj
+++ b/w32/VS2019/largepost.vcxproj
@@ -49,7 +49,7 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries
Condition="$(Configuration.StartsWith('Debug'))">true</UseDebugLibraries>
<UseDebugLibraries Condition="!
$(Configuration.StartsWith('Debug'))">false</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization Condition="!
$(Configuration.StartsWith('Debug'))">true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
diff --git a/w32/VS2017/libmicrohttpd.sln b/w32/VS2019/libmicrohttpd.sln
similarity index 53%
copy from w32/VS2017/libmicrohttpd.sln
copy to w32/VS2019/libmicrohttpd.sln
index 3971e463..d74202a7 100644
--- a/w32/VS2017/libmicrohttpd.sln
+++ b/w32/VS2019/libmicrohttpd.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.156
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hellobrowser",
"hellobrowser.vcxproj", "{310F39BD-A2D6-44FF-8344-37ADD0524CBD}"
ProjectSection(ProjectDependencies) = postProject
@@ -16,7 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =
"simplepost", "simplepost.vc
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "largepost",
"largepost.vcxproj", "{77A27E6D-9A39-40B8-961B-40E63DB7FA65}"
- ProjectSection(ProjectDependencies) = postProject
+ ProjectSection(ProjectDependencies) = postProject
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} =
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}
EndProjectSection
EndProject
@@ -24,150 +24,78 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug-dll|Win32 = Debug-dll|Win32
Debug-dll|x64 = Debug-dll|x64
- Debug-dll-xp|Win32 = Debug-dll-xp|Win32
- Debug-dll-xp|x64 = Debug-dll-xp|x64
Debug-static|Win32 = Debug-static|Win32
Debug-static|x64 = Debug-static|x64
- Debug-static-xp|Win32 = Debug-static-xp|Win32
- Debug-static-xp|x64 = Debug-static-xp|x64
Release-dll|Win32 = Release-dll|Win32
Release-dll|x64 = Release-dll|x64
- Release-dll-xp|Win32 = Release-dll-xp|Win32
- Release-dll-xp|x64 = Release-dll-xp|x64
Release-static|Win32 = Release-static|Win32
Release-static|x64 = Release-static|x64
- Release-static-xp|Win32 = Release-static-xp|Win32
- Release-static-xp|x64 = Release-static-xp|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll|Win32.ActiveCfg =
Debug-dll|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll|Win32.Build.0
= Debug-dll|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll|x64.ActiveCfg
= Debug-dll|x64
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll|x64.Build.0 =
Debug-dll|x64
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|Win32.ActiveCfg =
Debug-dll-xp|Win32
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|Win32.Build.0 =
Debug-dll-xp|Win32
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|x64.ActiveCfg =
Debug-dll-xp|x64
- {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|x64.Build.0
= Debug-dll-xp|x64
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.ActiveCfg =
Debug-static|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.Build.0 =
Debug-static|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.ActiveCfg =
Debug-static|x64
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.Build.0
= Debug-static|x64
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.ActiveCfg =
Debug-static-xp|Win32
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.Build.0 =
Debug-static-xp|Win32
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|x64.ActiveCfg =
Debug-static-xp|x64
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|x64.Build.0 =
Debug-static-xp|x64
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll|Win32.ActiveCfg =
Release-dll|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll|Win32.Build.0 =
Release-dll|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll|x64.ActiveCfg =
Release-dll|x64
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll|x64.Build.0
= Release-dll|x64
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll-xp|Win32.ActiveCfg =
Release-dll-xp|Win32
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll-xp|Win32.Build.0 =
Release-dll-xp|Win32
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll-xp|x64.ActiveCfg =
Release-dll-xp|x64
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll-xp|x64.Build.0 =
Release-dll-xp|x64
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static|Win32.ActiveCfg =
Release-static|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static|Win32.Build.0 =
Release-static|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static|x64.ActiveCfg =
Release-static|x64
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static|x64.Build.0 =
Release-static|x64
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static-xp|Win32.ActiveCfg =
Release-static-xp|Win32
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static-xp|Win32.Build.0 =
Release-static-xp|Win32
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static-xp|x64.ActiveCfg =
Release-static-xp|x64
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static-xp|x64.Build.0 =
Release-static-xp|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll|Win32.ActiveCfg =
Debug-dll|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll|Win32.Build.0
= Debug-dll|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll|x64.ActiveCfg
= Debug-dll|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll|x64.Build.0 =
Debug-dll|x64
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|Win32.ActiveCfg =
Debug-dll|Win32
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|Win32.Build.0 =
Debug-dll|Win32
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|x64.ActiveCfg =
Debug-dll|x64
- {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|x64.Build.0
= Debug-dll|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.ActiveCfg =
Debug-static|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.Build.0 =
Debug-static|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.ActiveCfg =
Debug-static|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.Build.0
= Debug-static|x64
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.ActiveCfg =
Debug-static|Win32
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.Build.0 =
Debug-static|Win32
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|x64.ActiveCfg =
Debug-static|x64
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|x64.Build.0 =
Debug-static|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll|Win32.ActiveCfg =
Release-dll|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll|Win32.Build.0 =
Release-dll|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll|x64.ActiveCfg =
Release-dll|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll|x64.Build.0
= Release-dll|x64
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll-xp|Win32.ActiveCfg =
Release-dll|Win32
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll-xp|Win32.Build.0 =
Release-dll|Win32
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll-xp|x64.ActiveCfg =
Release-dll|x64
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll-xp|x64.Build.0 =
Release-dll|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static|Win32.ActiveCfg =
Release-static|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static|Win32.Build.0 =
Release-static|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static|x64.ActiveCfg =
Release-static|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static|x64.Build.0 =
Release-static|x64
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static-xp|Win32.ActiveCfg =
Release-static|Win32
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static-xp|Win32.Build.0 =
Release-static|Win32
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static-xp|x64.ActiveCfg =
Release-static|x64
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static-xp|x64.Build.0 =
Release-static|x64
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-dll|Win32.ActiveCfg =
Debug-dll|Win32
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-dll|Win32.Build.0
= Debug-dll|Win32
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-dll|x64.ActiveCfg
= Debug-dll|x64
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-dll|x64.Build.0 =
Debug-dll|x64
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-dll-xp|Win32.ActiveCfg =
Debug-dll|Win32
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-dll-xp|Win32.Build.0 =
Debug-dll|Win32
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-dll-xp|x64.ActiveCfg =
Debug-dll|x64
- {294D5317-E983-4682-8DB5-678EA4645E11}.Debug-dll-xp|x64.Build.0
= Debug-dll|x64
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-static|Win32.ActiveCfg =
Debug-static|Win32
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-static|Win32.Build.0 =
Debug-static|Win32
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-static|x64.ActiveCfg =
Debug-static|x64
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-static|x64.Build.0
= Debug-static|x64
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-static-xp|Win32.ActiveCfg =
Debug-static|Win32
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-static-xp|Win32.Build.0 =
Debug-static|Win32
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-static-xp|x64.ActiveCfg =
Debug-static|x64
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Debug-static-xp|x64.Build.0 =
Debug-static|x64
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-dll|Win32.ActiveCfg =
Release-dll|Win32
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-dll|Win32.Build.0 =
Release-dll|Win32
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-dll|x64.ActiveCfg =
Release-dll|x64
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-dll|x64.Build.0
= Release-dll|x64
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-dll-xp|Win32.ActiveCfg =
Release-dll|Win32
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-dll-xp|Win32.Build.0 =
Release-dll|Win32
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-dll-xp|x64.ActiveCfg =
Release-dll|x64
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-dll-xp|x64.Build.0 =
Release-dll|x64
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-static|Win32.ActiveCfg =
Release-static|Win32
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-static|Win32.Build.0 =
Release-static|Win32
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-static|x64.ActiveCfg =
Release-static|x64
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-static|x64.Build.0 =
Release-static|x64
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-static-xp|Win32.ActiveCfg =
Release-static|Win32
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-static-xp|Win32.Build.0 =
Release-static|Win32
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-static-xp|x64.ActiveCfg =
Release-static|x64
-
{294D5317-E983-4682-8DB5-678EA4645E11}.Release-static-xp|x64.Build.0 =
Release-static|x64
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-dll|Win32.ActiveCfg =
Debug-dll|Win32
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-dll|Win32.Build.0
= Debug-dll|Win32
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-dll|x64.ActiveCfg
= Debug-dll|x64
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-dll|x64.Build.0 =
Debug-dll|x64
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-dll-xp|Win32.ActiveCfg =
Debug-dll|Win32
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-dll-xp|Win32.Build.0 =
Debug-dll|Win32
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-dll-xp|x64.ActiveCfg =
Debug-dll|x64
- {77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-dll-xp|x64.Build.0
= Debug-dll|x64
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-static|Win32.ActiveCfg =
Debug-static|Win32
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-static|Win32.Build.0 =
Debug-static|Win32
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-static|x64.ActiveCfg =
Debug-static|x64
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-static|x64.Build.0
= Debug-static|x64
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-static-xp|Win32.ActiveCfg =
Debug-static|Win32
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-static-xp|Win32.Build.0 =
Debug-static|Win32
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-static-xp|x64.ActiveCfg =
Debug-static|x64
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Debug-static-xp|x64.Build.0 =
Debug-static|x64
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-dll|Win32.ActiveCfg =
Release-dll|Win32
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-dll|Win32.Build.0 =
Release-dll|Win32
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-dll|x64.ActiveCfg =
Release-dll|x64
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-dll|x64.Build.0
= Release-dll|x64
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-dll-xp|Win32.ActiveCfg =
Release-dll|Win32
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-dll-xp|Win32.Build.0 =
Release-dll|Win32
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-dll-xp|x64.ActiveCfg =
Release-dll|x64
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-dll-xp|x64.Build.0 =
Release-dll|x64
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-static|Win32.ActiveCfg =
Release-static|Win32
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-static|Win32.Build.0 =
Release-static|Win32
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-static|x64.ActiveCfg =
Release-static|x64
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-static|x64.Build.0 =
Release-static|x64
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-static-xp|Win32.ActiveCfg =
Release-static|Win32
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-static-xp|Win32.Build.0 =
Release-static|Win32
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-static-xp|x64.ActiveCfg =
Release-static|x64
-
{77A27E6D-9A39-40B8-961B-40E63DB7FA65}.Release-static-xp|x64.Build.0 =
Release-static|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/w32/VS2017/hellobrowser.vcxproj b/w32/VS2019/libmicrohttpd.vcxproj
similarity index 81%
copy from w32/VS2017/hellobrowser.vcxproj
copy to w32/VS2019/libmicrohttpd.vcxproj
index ed29e613..fb4bf80d 100644
--- a/w32/VS2017/hellobrowser.vcxproj
+++ b/w32/VS2019/libmicrohttpd.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<Import Project="$(SolutionDir)..\common\vs_dirs.props" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug-dll|Win32">
@@ -35,21 +35,22 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
- <Import Project="$(MhdW32Common)\hellobrowser-files.vcxproj" />
+ <Import Project="$(MhdW32Common)\libmicrohttpd-files.vcxproj" />
<PropertyGroup Label="Globals">
- <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid>
+ <ProjectGuid>{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
- <RootNamespace>hellobrowser</RootNamespace>
+ <RootNamespace>libmicrohttpd</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
+ <ConfigurationType
Condition="$(Configuration.EndsWith('-static'))">StaticLibrary</ConfigurationType>
+ <ConfigurationType Condition="!
$(Configuration.EndsWith('-static'))">DynamicLibrary</ConfigurationType>
<UseDebugLibraries
Condition="$(Configuration.StartsWith('Debug'))">true</UseDebugLibraries>
<UseDebugLibraries Condition="!
$(Configuration.StartsWith('Debug'))">false</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization Condition="!
$(Configuration.StartsWith('Debug'))">true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
@@ -60,12 +61,12 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<Import Project="$(MhdW32Common)common-build-settings.vcxproj" />
- <Import Project="$(MhdW32Common)apps-build-settings.vcxproj" />
+ <Import Project="$(MhdW32Common)libmicrohttpd-build-settings.vcxproj" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile />
<Link />
- <ProjectReference />
+ <Lib />
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/w32/VS2013/libmicrohttpd.vcxproj.filters
b/w32/VS2019/libmicrohttpd.vcxproj.filters
similarity index 100%
copy from w32/VS2013/libmicrohttpd.vcxproj.filters
copy to w32/VS2019/libmicrohttpd.vcxproj.filters
diff --git a/w32/VS2017/simplepost.vcxproj b/w32/VS2019/simplepost.vcxproj
similarity index 94%
copy from w32/VS2017/simplepost.vcxproj
copy to w32/VS2019/simplepost.vcxproj
index cfd12aa1..aebbdb33 100644
--- a/w32/VS2017/simplepost.vcxproj
+++ b/w32/VS2019/simplepost.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<Import Project="$(SolutionDir)..\common\vs_dirs.props" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug-dll|Win32">
@@ -49,7 +49,7 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries
Condition="$(Configuration.StartsWith('Debug'))">true</UseDebugLibraries>
<UseDebugLibraries Condition="!
$(Configuration.StartsWith('Debug'))">false</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization Condition="!
$(Configuration.StartsWith('Debug'))">true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [libmicrohttpd] branch master updated (d9506b7d -> fbe1ba9d),
gnunet <=