aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-04-11 14:08:21 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-04-11 14:08:21 +0000
commit5f5447afa0d9f5e06d51a8fbd0b3fddd8af43be9 (patch)
treedac4d5faac252ec4360faeb74f3c6e318abd07f3
parent2cf1ffafba7a3cbdcb094d7c8b1aa3b89b851425 (diff)
downloadlibmicrohttpd-5f5447afa0d9f5e06d51a8fbd0b3fddd8af43be9.tar.gz
libmicrohttpd-5f5447afa0d9f5e06d51a8fbd0b3fddd8af43be9.zip
VS projects updated: cleanup, renamed file
-rw-r--r--Makefile.am3
-rw-r--r--w32/.gitignore1
-rw-r--r--w32/VS2013/hellobrowser.vcxproj2
-rw-r--r--w32/VS2015/hellobrowser.vcxproj2
-rw-r--r--w32/common/apps-build-settings.vcxproj (renamed from w32/common/hellobrowser-build-settings.vcxproj)0
-rw-r--r--w32/common/hellobrowser-filters.vcxproj8
6 files changed, 5 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 4cf539dc..d701936a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ SUBDIRS = contrib src m4 .
4W32COMMON = w32/common/gen_dll_res.ps1 w32/common/microhttpd_dll_res_vc.rc.in w32/common/microhttpd_dll_res_vc.rc \ 4W32COMMON = w32/common/gen_dll_res.ps1 w32/common/microhttpd_dll_res_vc.rc.in w32/common/microhttpd_dll_res_vc.rc \
5 w32/common/MHD_config.h w32/common/vs_dirs.props w32/common/common-build-settings.vcxproj \ 5 w32/common/MHD_config.h w32/common/vs_dirs.props w32/common/common-build-settings.vcxproj \
6 w32/common/libmicrohttpd-build-settings.vcxproj w32/common/libmicrohttpd-files.vcxproj w32/common/libmicrohttpd-filters.vcxproj \ 6 w32/common/libmicrohttpd-build-settings.vcxproj w32/common/libmicrohttpd-files.vcxproj w32/common/libmicrohttpd-filters.vcxproj \
7 w32/common/hellobrowser-build-settings.vcxproj w32/common/hellobrowser-files.vcxproj w32/common/hellobrowser-filters.vcxproj 7 w32/common/hellobrowser-files.vcxproj w32/common/hellobrowser-filters.vcxproj \
8 w32/common/apps-build-settings.vcxproj
8W32VS2013 = w32/VS2013/libmicrohttpd.vcxproj w32/VS2013/libmicrohttpd.vcxproj.filters \ 9W32VS2013 = w32/VS2013/libmicrohttpd.vcxproj w32/VS2013/libmicrohttpd.vcxproj.filters \
9 w32/VS2013/hellobrowser.vcxproj w32/VS2013/hellobrowser.vcxproj.filters \ 10 w32/VS2013/hellobrowser.vcxproj w32/VS2013/hellobrowser.vcxproj.filters \
10 w32/VS2013/libmicrohttpd.sln 11 w32/VS2013/libmicrohttpd.sln
diff --git a/w32/.gitignore b/w32/.gitignore
index 8199bd81..f135e603 100644
--- a/w32/.gitignore
+++ b/w32/.gitignore
@@ -10,4 +10,5 @@
10*.tlog 10*.tlog
11*.idb 11*.idb
12*.rc 12*.rc
13*.VC.db
13.vs 14.vs
diff --git a/w32/VS2013/hellobrowser.vcxproj b/w32/VS2013/hellobrowser.vcxproj
index 21970cbc..450f1485 100644
--- a/w32/VS2013/hellobrowser.vcxproj
+++ b/w32/VS2013/hellobrowser.vcxproj
@@ -78,7 +78,7 @@
78 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 78 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
79 </ImportGroup> 79 </ImportGroup>
80 <Import Project="$(MhdW32Common)common-build-settings.vcxproj" /> 80 <Import Project="$(MhdW32Common)common-build-settings.vcxproj" />
81 <Import Project="$(MhdW32Common)hellobrowser-build-settings.vcxproj" /> 81 <Import Project="$(MhdW32Common)apps-build-settings.vcxproj" />
82 <PropertyGroup /> 82 <PropertyGroup />
83 <ItemDefinitionGroup> 83 <ItemDefinitionGroup>
84 <ClCompile /> 84 <ClCompile />
diff --git a/w32/VS2015/hellobrowser.vcxproj b/w32/VS2015/hellobrowser.vcxproj
index a831969d..d546c5de 100644
--- a/w32/VS2015/hellobrowser.vcxproj
+++ b/w32/VS2015/hellobrowser.vcxproj
@@ -78,7 +78,7 @@
78 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 78 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
79 </ImportGroup> 79 </ImportGroup>
80 <Import Project="$(MhdW32Common)common-build-settings.vcxproj" /> 80 <Import Project="$(MhdW32Common)common-build-settings.vcxproj" />
81 <Import Project="$(MhdW32Common)hellobrowser-build-settings.vcxproj" /> 81 <Import Project="$(MhdW32Common)apps-build-settings.vcxproj" />
82 <PropertyGroup /> 82 <PropertyGroup />
83 <ItemDefinitionGroup> 83 <ItemDefinitionGroup>
84 <ClCompile /> 84 <ClCompile />
diff --git a/w32/common/hellobrowser-build-settings.vcxproj b/w32/common/apps-build-settings.vcxproj
index 45e7ed7a..45e7ed7a 100644
--- a/w32/common/hellobrowser-build-settings.vcxproj
+++ b/w32/common/apps-build-settings.vcxproj
diff --git a/w32/common/hellobrowser-filters.vcxproj b/w32/common/hellobrowser-filters.vcxproj
index c985906e..14384940 100644
--- a/w32/common/hellobrowser-filters.vcxproj
+++ b/w32/common/hellobrowser-filters.vcxproj
@@ -5,14 +5,6 @@
5 <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> 5 <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6 <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> 6 <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7 </Filter> 7 </Filter>
8 <Filter Include="Header Files">
9 <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10 <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
11 </Filter>
12 <Filter Include="Resource Files">
13 <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14 <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15 </Filter>
16 </ItemGroup> 8 </ItemGroup>
17 <ItemGroup> 9 <ItemGroup>
18 <ClCompile Include="$(MhdRoot)doc\examples\hellobrowser.c"> 10 <ClCompile Include="$(MhdRoot)doc\examples\hellobrowser.c">