[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37017 - in libmicrohttpd: . w32 w32/VS2013 w32/VS2015 w32/
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37017 - in libmicrohttpd: . w32 w32/VS2013 w32/VS2015 w32/common |
Date: |
Mon, 11 Apr 2016 16:08:21 +0200 |
Author: Karlson2k
Date: 2016-04-11 16:08:21 +0200 (Mon, 11 Apr 2016)
New Revision: 37017
Added:
libmicrohttpd/w32/common/apps-build-settings.vcxproj
Removed:
libmicrohttpd/w32/common/hellobrowser-build-settings.vcxproj
Modified:
libmicrohttpd/Makefile.am
libmicrohttpd/w32/.gitignore
libmicrohttpd/w32/VS2013/hellobrowser.vcxproj
libmicrohttpd/w32/VS2015/hellobrowser.vcxproj
libmicrohttpd/w32/common/hellobrowser-filters.vcxproj
Log:
VS projects updated: cleanup, renamed file
Modified: libmicrohttpd/Makefile.am
===================================================================
--- libmicrohttpd/Makefile.am 2016-04-11 14:08:18 UTC (rev 37016)
+++ libmicrohttpd/Makefile.am 2016-04-11 14:08:21 UTC (rev 37017)
@@ -4,7 +4,8 @@
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-build-settings.vcxproj
w32/common/hellobrowser-files.vcxproj w32/common/hellobrowser-filters.vcxproj
+ w32/common/hellobrowser-files.vcxproj
w32/common/hellobrowser-filters.vcxproj \
+ w32/common/apps-build-settings.vcxproj
W32VS2013 = w32/VS2013/libmicrohttpd.vcxproj
w32/VS2013/libmicrohttpd.vcxproj.filters \
w32/VS2013/hellobrowser.vcxproj w32/VS2013/hellobrowser.vcxproj.filters \
w32/VS2013/libmicrohttpd.sln
Modified: libmicrohttpd/w32/.gitignore
===================================================================
--- libmicrohttpd/w32/.gitignore 2016-04-11 14:08:18 UTC (rev 37016)
+++ libmicrohttpd/w32/.gitignore 2016-04-11 14:08:21 UTC (rev 37017)
@@ -10,4 +10,5 @@
*.tlog
*.idb
*.rc
+*.VC.db
.vs
Modified: libmicrohttpd/w32/VS2013/hellobrowser.vcxproj
===================================================================
--- libmicrohttpd/w32/VS2013/hellobrowser.vcxproj 2016-04-11 14:08:18 UTC
(rev 37016)
+++ libmicrohttpd/w32/VS2013/hellobrowser.vcxproj 2016-04-11 14:08:21 UTC
(rev 37017)
@@ -78,7 +78,7 @@
<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)hellobrowser-build-settings.vcxproj" />
+ <Import Project="$(MhdW32Common)apps-build-settings.vcxproj" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile />
Modified: libmicrohttpd/w32/VS2015/hellobrowser.vcxproj
===================================================================
--- libmicrohttpd/w32/VS2015/hellobrowser.vcxproj 2016-04-11 14:08:18 UTC
(rev 37016)
+++ libmicrohttpd/w32/VS2015/hellobrowser.vcxproj 2016-04-11 14:08:21 UTC
(rev 37017)
@@ -78,7 +78,7 @@
<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)hellobrowser-build-settings.vcxproj" />
+ <Import Project="$(MhdW32Common)apps-build-settings.vcxproj" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile />
Copied: libmicrohttpd/w32/common/apps-build-settings.vcxproj (from rev 37016,
libmicrohttpd/w32/common/hellobrowser-build-settings.vcxproj)
===================================================================
--- libmicrohttpd/w32/common/apps-build-settings.vcxproj
(rev 0)
+++ libmicrohttpd/w32/common/apps-build-settings.vcxproj 2016-04-11
14:08:21 UTC (rev 37017)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(Configuration)'=='Debug-static'">
+ <TargetName>$(ProjectName)_d</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)'=='Debug-dll'">
+ <TargetName>$(ProjectName)-dll_d</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)'=='Release-static'">
+ <TargetName>$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)'=='Release-dll'">
+ <TargetName>$(ProjectName)-dll</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <ProjectReference />
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <RuntimeLibrary
Condition="'$(Configuration)'=='Debug-static'">MultiThreadedDebug</RuntimeLibrary>
+ <RuntimeLibrary
Condition="'$(Configuration)'=='Debug-dll'">MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeLibrary
Condition="'$(Configuration)'=='Release-static'">MultiThreaded</RuntimeLibrary>
+ <RuntimeLibrary
Condition="'$(Configuration)'=='Release-dll'">MultiThreadedDLL</RuntimeLibrary>
+ </ClCompile>
+ </ItemDefinitionGroup>
+</Project>
Deleted: libmicrohttpd/w32/common/hellobrowser-build-settings.vcxproj
===================================================================
--- libmicrohttpd/w32/common/hellobrowser-build-settings.vcxproj
2016-04-11 14:08:18 UTC (rev 37016)
+++ libmicrohttpd/w32/common/hellobrowser-build-settings.vcxproj
2016-04-11 14:08:21 UTC (rev 37017)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)'=='Debug-static'">
- <TargetName>$(ProjectName)_d</TargetName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)'=='Debug-dll'">
- <TargetName>$(ProjectName)-dll_d</TargetName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)'=='Release-static'">
- <TargetName>$(ProjectName)</TargetName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)'=='Release-dll'">
- <TargetName>$(ProjectName)-dll</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup>
- <ClCompile>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- </Link>
- <ProjectReference />
- </ItemDefinitionGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <RuntimeLibrary
Condition="'$(Configuration)'=='Debug-static'">MultiThreadedDebug</RuntimeLibrary>
- <RuntimeLibrary
Condition="'$(Configuration)'=='Debug-dll'">MultiThreadedDebugDLL</RuntimeLibrary>
- <RuntimeLibrary
Condition="'$(Configuration)'=='Release-static'">MultiThreaded</RuntimeLibrary>
- <RuntimeLibrary
Condition="'$(Configuration)'=='Release-dll'">MultiThreadedDLL</RuntimeLibrary>
- </ClCompile>
- </ItemDefinitionGroup>
-</Project>
Modified: libmicrohttpd/w32/common/hellobrowser-filters.vcxproj
===================================================================
--- libmicrohttpd/w32/common/hellobrowser-filters.vcxproj 2016-04-11
14:08:18 UTC (rev 37016)
+++ libmicrohttpd/w32/common/hellobrowser-filters.vcxproj 2016-04-11
14:08:21 UTC (rev 37017)
@@ -5,14 +5,6 @@
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
- <Filter Include="Header Files">
-
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
-
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MhdRoot)doc\examples\hellobrowser.c">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37017 - in libmicrohttpd: . w32 w32/VS2013 w32/VS2015 w32/common,
gnunet <=