Ver código fonte

W32 VS Project: minor internal fixes, fixed files for "dist"

Evgeny Grin (Karlson2k) 2 anos atrás
pai
commit
36af2166bc

+ 6 - 4
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 \

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 5 - 5
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 5 - 5
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 5 - 5
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 4 - 4
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 />

+ 0 - 0
w32/common/apps-build-settings.vcxproj → w32/common/apps-build-settings.props


+ 0 - 0
w32/common/common-build-settings.vcxproj → w32/common/common-build-settings.props


+ 2 - 1
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"

+ 0 - 0
w32/common/libmicrohttpd-build-settings.vcxproj → w32/common/libmicrohttpd-build-settings.props


+ 33 - 0
w32/common/project-configs-xp.vcxproj → 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>

+ 0 - 0
w32/common/project-configs.vcxproj → w32/common/project-configs.props