From d67783e428b8041d991891ef26315ccb8fdf009f Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Fri, 26 May 2023 16:04:53 +0300 Subject: [PATCH] W32 VS Project: minor internal fixes, fixed files for "dist" --- Makefile.am | 10 +++--- w32/VS-Any-Version/hellobrowser.vcxproj | 8 ++--- w32/VS-Any-Version/largepost.vcxproj | 8 ++--- w32/VS-Any-Version/libmicrohttpd.vcxproj | 8 ++--- w32/VS-Any-Version/simplepost.vcxproj | 8 ++--- w32/VS2013/hellobrowser.vcxproj | 8 ++--- w32/VS2013/largepost.vcxproj | 8 ++--- w32/VS2013/libmicrohttpd.vcxproj | 10 +++--- w32/VS2013/simplepost.vcxproj | 8 ++--- w32/VS2015/hellobrowser.vcxproj | 8 ++--- w32/VS2015/largepost.vcxproj | 8 ++--- w32/VS2015/libmicrohttpd.vcxproj | 10 +++--- w32/VS2015/simplepost.vcxproj | 8 ++--- w32/VS2017/hellobrowser.vcxproj | 8 ++--- w32/VS2017/largepost.vcxproj | 8 ++--- w32/VS2017/libmicrohttpd.vcxproj | 10 +++--- w32/VS2017/simplepost.vcxproj | 8 ++--- w32/VS2019/hellobrowser.vcxproj | 8 ++--- w32/VS2019/largepost.vcxproj | 8 ++--- w32/VS2019/libmicrohttpd.vcxproj | 8 ++--- w32/VS2019/simplepost.vcxproj | 8 ++--- w32/VS2022/hellobrowser.vcxproj | 8 ++--- w32/VS2022/largepost.vcxproj | 8 ++--- w32/VS2022/libmicrohttpd.vcxproj | 8 ++--- w32/VS2022/simplepost.vcxproj | 8 ++--- ...ings.vcxproj => apps-build-settings.props} | 0 ...gs.vcxproj => common-build-settings.props} | 0 w32/common/gen_dll_res.ps1 | 3 +- ...roj => libmicrohttpd-build-settings.props} | 0 ...gs-xp.vcxproj => project-configs-xp.props} | 33 +++++++++++++++++++ ...-configs.vcxproj => project-configs.props} | 0 31 files changed, 140 insertions(+), 104 deletions(-) rename w32/common/{apps-build-settings.vcxproj => apps-build-settings.props} (100%) rename w32/common/{common-build-settings.vcxproj => common-build-settings.props} (100%) rename w32/common/{libmicrohttpd-build-settings.vcxproj => libmicrohttpd-build-settings.props} (100%) rename w32/common/{project-configs-xp.vcxproj => project-configs-xp.props} (51%) rename w32/common/{project-configs.vcxproj => project-configs.props} (100%) diff --git a/Makefile.am b/Makefile.am index 635e02c3..e09cb2e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,10 +12,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 @@  - - + + 16.0 {310F39BD-A2D6-44FF-8344-37ADD0524CBD} @@ -27,8 +27,8 @@ - - + + 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 @@  - - + + {77A27E6D-9A39-40B8-961B-40E63DB7FA65} Win32Proj @@ -26,8 +26,8 @@ - - + + 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 @@  - - + + {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} Win32Proj @@ -28,8 +28,8 @@ - - + + 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 @@  - - + + {294D5317-E983-4682-8DB5-678EA4645E11} Win32Proj @@ -26,8 +26,8 @@ - - + + 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 @@  - - + + {310F39BD-A2D6-44FF-8344-37ADD0524CBD} Win32Proj @@ -44,8 +44,8 @@ - - + + 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 @@  - - + + {77A27E6D-9A39-40B8-961B-40E63DB7FA65} Win32Proj @@ -44,8 +44,8 @@ - - + + 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 @@  - - - + + + {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} Win32Proj @@ -71,8 +71,8 @@ - - + + 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 @@  - - + + {294D5317-E983-4682-8DB5-678EA4645E11} Win32Proj @@ -44,8 +44,8 @@ - - + + 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 @@  - - + + {310F39BD-A2D6-44FF-8344-37ADD0524CBD} Win32Proj @@ -44,8 +44,8 @@ - - + + 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 @@  - - + + {77A27E6D-9A39-40B8-961B-40E63DB7FA65} Win32Proj @@ -44,8 +44,8 @@ - - + + 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 @@  - - - + + + {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} Win32Proj @@ -71,8 +71,8 @@ - - + + 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 @@  - - + + {294D5317-E983-4682-8DB5-678EA4645E11} Win32Proj @@ -44,8 +44,8 @@ - - + + 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 @@  - - + + {310F39BD-A2D6-44FF-8344-37ADD0524CBD} Win32Proj @@ -26,8 +26,8 @@ - - + + 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 @@  - - + + {77A27E6D-9A39-40B8-961B-40E63DB7FA65} Win32Proj @@ -26,8 +26,8 @@ - - + + 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 @@  - - - + + + {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} Win32Proj @@ -29,8 +29,8 @@ - - + + 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 @@  - - + + {294D5317-E983-4682-8DB5-678EA4645E11} Win32Proj @@ -26,8 +26,8 @@ - - + + 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 @@  - - + + 16.0 {310F39BD-A2D6-44FF-8344-37ADD0524CBD} @@ -27,8 +27,8 @@ - - + + 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 @@  - - + + {77A27E6D-9A39-40B8-961B-40E63DB7FA65} Win32Proj @@ -26,8 +26,8 @@ - - + + 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 @@  - - + + {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} Win32Proj @@ -27,8 +27,8 @@ - - + + 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 @@  - - + + {294D5317-E983-4682-8DB5-678EA4645E11} Win32Proj @@ -26,8 +26,8 @@ - - + + 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 @@  - - + + 16.0 {310F39BD-A2D6-44FF-8344-37ADD0524CBD} @@ -27,8 +27,8 @@ - - + + 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 @@  - - + + {77A27E6D-9A39-40B8-961B-40E63DB7FA65} Win32Proj @@ -26,8 +26,8 @@ - - + + 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 @@  - - + + {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} Win32Proj @@ -27,8 +27,8 @@ - - + + 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 @@  - - + + {294D5317-E983-4682-8DB5-678EA4645E11} Win32Proj @@ -26,8 +26,8 @@ - - + + diff --git a/w32/common/apps-build-settings.vcxproj b/w32/common/apps-build-settings.props similarity index 100% rename from w32/common/apps-build-settings.vcxproj rename to w32/common/apps-build-settings.props diff --git a/w32/common/common-build-settings.vcxproj b/w32/common/common-build-settings.props similarity index 100% rename from w32/common/common-build-settings.vcxproj rename to 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 similarity index 100% rename from w32/common/libmicrohttpd-build-settings.vcxproj rename to w32/common/libmicrohttpd-build-settings.props diff --git a/w32/common/project-configs-xp.vcxproj b/w32/common/project-configs-xp.props similarity index 51% rename from w32/common/project-configs-xp.vcxproj rename to 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 @@ Release-static-xp x64 + + + Debug-dll-xp + ARM + + + Debug-dll-xp + ARM64 + + + Debug-static-xp + ARM + + + Debug-static-xp + ARM64 + + + Release-dll-xp + ARM + + + Release-dll-xp + ARM64 + + + Release-static-xp + ARM + + + Release-static-xp + ARM64 + diff --git a/w32/common/project-configs.vcxproj b/w32/common/project-configs.props similarity index 100% rename from w32/common/project-configs.vcxproj rename to w32/common/project-configs.props