diff options
| author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2023-05-26 16:04:53 +0300 |
|---|---|---|
| committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2023-06-01 13:28:25 +0300 |
| commit | 36af2166bc59f94fc00f8de4ca9f4cf54cf93eb3 (patch) | |
| tree | b487a606b9c765369244146c2ecf4398f7b30510 | |
| parent | dca5d029c96a022d813675d7c7b1c1116ce38533 (diff) | |
W32 VS Project: minor internal fixes, fixed files for "dist"
31 files changed, 140 insertions, 104 deletions
diff --git a/Makefile.am b/Makefile.am index 37d058b6..218d7b18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,10 +8,12 @@ endif W32COMMON = w32/common/gen_dll_res.ps1 w32/common/microhttpd_dll_res_vc.rc.in w32/common/microhttpd_dll_res_vc.rc \ - w32/common/MHD_config.h w32/common/vs_dirs.props w32/common/common-build-settings.vcxproj \ - w32/common/libmicrohttpd-build-settings.vcxproj w32/common/libmicrohttpd-files.vcxproj w32/common/libmicrohttpd-filters.vcxproj \ - w32/common/hellobrowser-files.vcxproj w32/common/hellobrowser-filters.vcxproj \ - w32/common/apps-build-settings.vcxproj + w32/common/MHD_config.h w32/common/vs_dirs.props \ + w32/common/common-build-settings.props w32/common/libmicrohttpd-build-settings.props \ + w32/common/apps-build-settings.props \ + w32/common/project-configs.props w32/common/project-configs-xp.props \ + w32/common/libmicrohttpd-files.vcxproj w32/common/libmicrohttpd-filters.vcxproj \ + w32/common/hellobrowser-files.vcxproj w32/common/hellobrowser-filters.vcxproj W32VS2013 = w32/VS2013/libmicrohttpd.vcxproj w32/VS2013/libmicrohttpd.vcxproj.filters \ w32/VS2013/hellobrowser.vcxproj w32/VS2013/hellobrowser.vcxproj.filters \ w32/VS2013/simplepost.vcxproj w32/VS2013/largepost.vcxproj \ diff --git a/w32/VS-Any-Version/hellobrowser.vcxproj b/w32/VS-Any-Version/hellobrowser.vcxproj index 6fa2560c..1e07fc1a 100644 --- a/w32/VS-Any-Version/hellobrowser.vcxproj +++ b/w32/VS-Any-Version/hellobrowser.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\hellobrowser-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)hellobrowser-files.vcxproj" /> <PropertyGroup Label="Globals"> <VCProjectVersion>16.0</VCProjectVersion> <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid> @@ -27,8 +27,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS-Any-Version/largepost.vcxproj b/w32/VS-Any-Version/largepost.vcxproj index d2ad781b..644259ac 100644 --- a/w32/VS-Any-Version/largepost.vcxproj +++ b/w32/VS-Any-Version/largepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\largepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)largepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{77A27E6D-9A39-40B8-961B-40E63DB7FA65}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -26,8 +26,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS-Any-Version/libmicrohttpd.vcxproj b/w32/VS-Any-Version/libmicrohttpd.vcxproj index 75244411..5e18ce0a 100644 --- a/w32/VS-Any-Version/libmicrohttpd.vcxproj +++ b/w32/VS-Any-Version/libmicrohttpd.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\libmicrohttpd-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -28,8 +28,8 @@ <ImportGroup Label="PropertySheets"> <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)libmicrohttpd-build-settings.vcxproj" /> + <Import Project="$(MhdW32Common)common-build-settings.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS-Any-Version/simplepost.vcxproj b/w32/VS-Any-Version/simplepost.vcxproj index 32eb9a60..43943e53 100644 --- a/w32/VS-Any-Version/simplepost.vcxproj +++ b/w32/VS-Any-Version/simplepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\simplepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)simplepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{294D5317-E983-4682-8DB5-678EA4645E11}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -26,8 +26,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2013/hellobrowser.vcxproj b/w32/VS2013/hellobrowser.vcxproj index ade16a2c..c6c0f0af 100644 --- a/w32/VS2013/hellobrowser.vcxproj +++ b/w32/VS2013/hellobrowser.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\hellobrowser-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)hellobrowser-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -44,8 +44,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2013/largepost.vcxproj b/w32/VS2013/largepost.vcxproj index c2cf7993..ee5618c4 100644 --- a/w32/VS2013/largepost.vcxproj +++ b/w32/VS2013/largepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\largepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)largepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{77A27E6D-9A39-40B8-961B-40E63DB7FA65}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -44,8 +44,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2013/libmicrohttpd.vcxproj b/w32/VS2013/libmicrohttpd.vcxproj index 16604ec0..630e578a 100644 --- a/w32/VS2013/libmicrohttpd.vcxproj +++ b/w32/VS2013/libmicrohttpd.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\project-configs-xp.vcxproj" /> - <Import Project="$(MhdW32Common)\libmicrohttpd-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)project-configs-xp.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -71,8 +71,8 @@ <ImportGroup Label="PropertySheets"> <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)libmicrohttpd-build-settings.vcxproj" /> + <Import Project="$(MhdW32Common)common-build-settings.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2013/simplepost.vcxproj b/w32/VS2013/simplepost.vcxproj index 29fc9d59..8575bc3d 100644 --- a/w32/VS2013/simplepost.vcxproj +++ b/w32/VS2013/simplepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\simplepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)simplepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{294D5317-E983-4682-8DB5-678EA4645E11}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -44,8 +44,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2015/hellobrowser.vcxproj b/w32/VS2015/hellobrowser.vcxproj index d59d7dcd..569a2168 100644 --- a/w32/VS2015/hellobrowser.vcxproj +++ b/w32/VS2015/hellobrowser.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\hellobrowser-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)hellobrowser-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -44,8 +44,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2015/largepost.vcxproj b/w32/VS2015/largepost.vcxproj index fb62eec2..60da77cc 100644 --- a/w32/VS2015/largepost.vcxproj +++ b/w32/VS2015/largepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\largepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)largepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{77A27E6D-9A39-40B8-961B-40E63DB7FA65}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -44,8 +44,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2015/libmicrohttpd.vcxproj b/w32/VS2015/libmicrohttpd.vcxproj index b9338f72..99469a7d 100644 --- a/w32/VS2015/libmicrohttpd.vcxproj +++ b/w32/VS2015/libmicrohttpd.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\project-configs-xp.vcxproj" /> - <Import Project="$(MhdW32Common)\libmicrohttpd-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)project-configs-xp.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -71,8 +71,8 @@ <ImportGroup Label="PropertySheets"> <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)libmicrohttpd-build-settings.vcxproj" /> + <Import Project="$(MhdW32Common)common-build-settings.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2015/simplepost.vcxproj b/w32/VS2015/simplepost.vcxproj index 2c1ae7a0..c59d8de5 100644 --- a/w32/VS2015/simplepost.vcxproj +++ b/w32/VS2015/simplepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\simplepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)simplepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{294D5317-E983-4682-8DB5-678EA4645E11}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -44,8 +44,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2017/hellobrowser.vcxproj b/w32/VS2017/hellobrowser.vcxproj index 4c476662..2437daa0 100644 --- a/w32/VS2017/hellobrowser.vcxproj +++ b/w32/VS2017/hellobrowser.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\hellobrowser-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)hellobrowser-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -26,8 +26,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2017/largepost.vcxproj b/w32/VS2017/largepost.vcxproj index ac531785..50caf380 100644 --- a/w32/VS2017/largepost.vcxproj +++ b/w32/VS2017/largepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\largepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)largepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{77A27E6D-9A39-40B8-961B-40E63DB7FA65}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -26,8 +26,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2017/libmicrohttpd.vcxproj b/w32/VS2017/libmicrohttpd.vcxproj index d0fc6f82..27f44bec 100644 --- a/w32/VS2017/libmicrohttpd.vcxproj +++ b/w32/VS2017/libmicrohttpd.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\project-configs-xp.vcxproj" /> - <Import Project="$(MhdW32Common)\libmicrohttpd-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)project-configs-xp.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -29,8 +29,8 @@ <ImportGroup Label="PropertySheets"> <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)libmicrohttpd-build-settings.vcxproj" /> + <Import Project="$(MhdW32Common)common-build-settings.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2017/simplepost.vcxproj b/w32/VS2017/simplepost.vcxproj index a127f8ff..f9564283 100644 --- a/w32/VS2017/simplepost.vcxproj +++ b/w32/VS2017/simplepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\simplepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)simplepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{294D5317-E983-4682-8DB5-678EA4645E11}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -26,8 +26,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2019/hellobrowser.vcxproj b/w32/VS2019/hellobrowser.vcxproj index c695018b..2335b2e3 100644 --- a/w32/VS2019/hellobrowser.vcxproj +++ b/w32/VS2019/hellobrowser.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\hellobrowser-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)hellobrowser-files.vcxproj" /> <PropertyGroup Label="Globals"> <VCProjectVersion>16.0</VCProjectVersion> <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid> @@ -27,8 +27,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2019/largepost.vcxproj b/w32/VS2019/largepost.vcxproj index 63639175..afde61b6 100644 --- a/w32/VS2019/largepost.vcxproj +++ b/w32/VS2019/largepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\largepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)largepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{77A27E6D-9A39-40B8-961B-40E63DB7FA65}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -26,8 +26,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2019/libmicrohttpd.vcxproj b/w32/VS2019/libmicrohttpd.vcxproj index 184b0bef..3d7d5a99 100644 --- a/w32/VS2019/libmicrohttpd.vcxproj +++ b/w32/VS2019/libmicrohttpd.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\libmicrohttpd-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -27,8 +27,8 @@ <ImportGroup Label="PropertySheets"> <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)libmicrohttpd-build-settings.vcxproj" /> + <Import Project="$(MhdW32Common)common-build-settings.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2019/simplepost.vcxproj b/w32/VS2019/simplepost.vcxproj index d267ca88..c674f658 100644 --- a/w32/VS2019/simplepost.vcxproj +++ b/w32/VS2019/simplepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\simplepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)simplepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{294D5317-E983-4682-8DB5-678EA4645E11}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -26,8 +26,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2022/hellobrowser.vcxproj b/w32/VS2022/hellobrowser.vcxproj index 36fc93fe..275ba5ad 100644 --- a/w32/VS2022/hellobrowser.vcxproj +++ b/w32/VS2022/hellobrowser.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\hellobrowser-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)hellobrowser-files.vcxproj" /> <PropertyGroup Label="Globals"> <VCProjectVersion>16.0</VCProjectVersion> <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid> @@ -27,8 +27,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2022/largepost.vcxproj b/w32/VS2022/largepost.vcxproj index acb9005c..067e7bc3 100644 --- a/w32/VS2022/largepost.vcxproj +++ b/w32/VS2022/largepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\largepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)largepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{77A27E6D-9A39-40B8-961B-40E63DB7FA65}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -26,8 +26,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2022/libmicrohttpd.vcxproj b/w32/VS2022/libmicrohttpd.vcxproj index 58f99506..f7af58d4 100644 --- a/w32/VS2022/libmicrohttpd.vcxproj +++ b/w32/VS2022/libmicrohttpd.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\libmicrohttpd-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -27,8 +27,8 @@ <ImportGroup Label="PropertySheets"> <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)libmicrohttpd-build-settings.vcxproj" /> + <Import Project="$(MhdW32Common)common-build-settings.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/VS2022/simplepost.vcxproj b/w32/VS2022/simplepost.vcxproj index bfc315bd..8625c32e 100644 --- a/w32/VS2022/simplepost.vcxproj +++ b/w32/VS2022/simplepost.vcxproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> - <Import Project="$(MhdW32Common)\project-configs.vcxproj" /> - <Import Project="$(MhdW32Common)\simplepost-files.vcxproj" /> + <Import Project="$(MhdW32Common)project-configs.props" /> + <Import Project="$(MhdW32Common)simplepost-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{294D5317-E983-4682-8DB5-678EA4645E11}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -26,8 +26,8 @@ <ImportGroup Label="PropertySheets"> <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)common-build-settings.props" /> + <Import Project="$(MhdW32Common)apps-build-settings.props" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile /> diff --git a/w32/common/apps-build-settings.vcxproj b/w32/common/apps-build-settings.props index 45e7ed7a..45e7ed7a 100644 --- a/w32/common/apps-build-settings.vcxproj +++ b/w32/common/apps-build-settings.props diff --git a/w32/common/common-build-settings.vcxproj b/w32/common/common-build-settings.props index 5d106ccb..5d106ccb 100644 --- a/w32/common/common-build-settings.vcxproj +++ b/w32/common/common-build-settings.props diff --git a/w32/common/gen_dll_res.ps1 b/w32/common/gen_dll_res.ps1 index 92560ee0..da8e4c6e 100644 --- a/w32/common/gen_dll_res.ps1 +++ b/w32/common/gen_dll_res.ps1 @@ -19,7 +19,8 @@ foreach($line in Get-Content "${BasePath}..\..\configure.ac") } if ("$MHD_ver" -eq "" -or "$MHD_ver_major" -eq "" -or "$MHD_ver_minor" -eq "" -or "$MHD_ver_patchlev" -eq "") { - Throw "Can't find MHD version in ${BasePath}..\..\configure.ac" + Write-Error -Message ("error MHDVSVER01 : Can't find MHD version") + Throw ($MyInvocation.MyCommand.Name + " : error MHDVSVER01 : Can't find MHD version") } Write-Output "Detected MHD version: $MHD_ver" diff --git a/w32/common/libmicrohttpd-build-settings.vcxproj b/w32/common/libmicrohttpd-build-settings.props index 76f2d0e7..76f2d0e7 100644 --- a/w32/common/libmicrohttpd-build-settings.vcxproj +++ b/w32/common/libmicrohttpd-build-settings.props diff --git a/w32/common/project-configs-xp.vcxproj b/w32/common/project-configs-xp.props index 2b3c6ada..60aafb7a 100644 --- a/w32/common/project-configs-xp.vcxproj +++ b/w32/common/project-configs-xp.props @@ -33,5 +33,38 @@ <Configuration>Release-static-xp</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <!-- Next configurations are uselss, but VS requires the full set to function properly --> + <ProjectConfiguration Include="Debug-dll-xp|ARM"> + <Configuration>Debug-dll-xp</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug-dll-xp|ARM64"> + <Configuration>Debug-dll-xp</Configuration> + <Platform>ARM64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug-static-xp|ARM"> + <Configuration>Debug-static-xp</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug-static-xp|ARM64"> + <Configuration>Debug-static-xp</Configuration> + <Platform>ARM64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release-dll-xp|ARM"> + <Configuration>Release-dll-xp</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release-dll-xp|ARM64"> + <Configuration>Release-dll-xp</Configuration> + <Platform>ARM64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release-static-xp|ARM"> + <Configuration>Release-static-xp</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release-static-xp|ARM64"> + <Configuration>Release-static-xp</Configuration> + <Platform>ARM64</Platform> + </ProjectConfiguration> </ItemGroup> </Project> diff --git a/w32/common/project-configs.vcxproj b/w32/common/project-configs.props index ca2dce64..ca2dce64 100644 --- a/w32/common/project-configs.vcxproj +++ b/w32/common/project-configs.props |