commit 74b2370bc2d062c8fdadb11d6b4750e83abe37e6 parent 974314357d5c270cc8f974e05e968ba2adac2429 Author: Evgeny Grin (Karlson2k) <k2k@narod.ru> Date: Thu, 3 Dec 2015 11:53:03 +0000 VS projects: restructured VS project files to share common values Diffstat:
| M | Makefile.am | | | 12 | ++++++++---- |
| M | w32/VS2013/hellobrowser.vcxproj | | | 95 | +++++-------------------------------------------------------------------------- |
| M | w32/VS2013/hellobrowser.vcxproj.filters | | | 21 | ++------------------- |
| M | w32/VS2013/libmicrohttpd.vcxproj | | | 149 | ++++--------------------------------------------------------------------------- |
| M | w32/VS2013/libmicrohttpd.vcxproj.filters | | | 128 | ++----------------------------------------------------------------------------- |
| R | w32/VS2013/MHD_config.h -> w32/common/MHD_config.h | | | 0 | |
| A | w32/common/common-build-settings.vcxproj | | | 99 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | w32/common/hellobrowser-build-settings.vcxproj | | | 32 | ++++++++++++++++++++++++++++++++ |
| A | w32/common/hellobrowser-files.vcxproj | | | 11 | +++++++++++ |
| A | w32/common/hellobrowser-filters.vcxproj | | | 22 | ++++++++++++++++++++++ |
| A | w32/common/libmicrohttpd-build-settings.vcxproj | | | 55 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | w32/common/libmicrohttpd-files.vcxproj | | | 2 | +- |
| A | w32/common/libmicrohttpd-filters.vcxproj | | | 129 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
13 files changed, 373 insertions(+), 382 deletions(-)
diff --git a/Makefile.am b/Makefile.am @@ -1,11 +1,15 @@ # This Makefile.am is in the public domain ACLOCAL_AMFLAGS = -I m4 SUBDIRS = contrib src m4 . +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 +W32VS2013 = w32/VS2013/libmicrohttpd.vcxproj w32/VS2013/libmicrohttpd.vcxproj.filters \ + w32/VS2013/hellobrowser.vcxproj w32/VS2013/hellobrowser.vcxproj.filters \ + w32/VS2013/libmicrohttpd.sln EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in \ - w32/VS2013/libmicrohttpd.sln w32/VS2013/libmicrohttpd.vcxproj w32/VS2013/libmicrohttpd.vcxproj.filters \ - w32/VS2013/hellobrowser.vcxproj w32/VS2013/hellobrowser.vcxproj.filters w32/VS2013/MHD_config.h \ - w32/common/vs_dirs.props \ - w32/common/gen_dll_res.ps1 w32/common/microhttpd_dll_res_vc.rc.in w32/common/microhttpd_dll_res_vc.rc + $(W32COMMON) $(W32VS2013) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libmicrohttpd.pc diff --git a/w32/VS2013/hellobrowser.vcxproj b/w32/VS2013/hellobrowser.vcxproj @@ -35,14 +35,7 @@ <Platform>x64</Platform> </ProjectConfiguration> </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MhdRoot)doc\examples\hellobrowser.c" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="libmicrohttpd.vcxproj"> - <Project>{9cfb0342-a9e7-483e-bee5-a1de22584c5a}</Project> - </ProjectReference> - </ItemGroup> + <Import Project="$(MhdW32Common)\hellobrowser-files.vcxproj" /> <PropertyGroup Label="Globals"> <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid> <Keyword>Win32Proj</Keyword> @@ -84,90 +77,14 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <IncludePath>$(MhdSrc)include;$(SolutionDir);$(IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Condition="'$(Platform)'=='Win32'"> - <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)Output\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Platform)'=='x64'"> - <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> - <OutDir>$(SolutionDir)Output\$(Platform)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(UseDebugLibraries)'=='true'"> - <LinkIncremental>true</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(UseDebugLibraries)'!='true'"> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <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> + <Import Project="$(MhdW32Common)common-build-settings.vcxproj" /> + <Import Project="$(MhdW32Common)hellobrowser-build-settings.vcxproj" /> + <PropertyGroup /> <ItemDefinitionGroup> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>WIN32;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <ProjectReference /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(UseDebugLibraries)'=='true'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> + <ClCompile /> + <Link /> <ProjectReference /> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(UseDebugLibraries)'!='true'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <ProjectReference /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-static'"> - <ClCompile> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <ProjectReference /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-dll'"> - <ClCompile> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - </ClCompile> - <ProjectReference /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)'=='Release-static'"> - <ClCompile> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)'=='Release-dll'"> - <ClCompile> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - </ClCompile> - </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/w32/VS2013/hellobrowser.vcxproj.filters b/w32/VS2013/hellobrowser.vcxproj.filters @@ -1,22 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <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"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> + <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> + <Import Project="$(MhdW32Common)hellobrowser-filters.vcxproj" /> </Project> \ No newline at end of file diff --git a/w32/VS2013/libmicrohttpd.vcxproj b/w32/VS2013/libmicrohttpd.vcxproj @@ -135,150 +135,13 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <PropertyGroup Label="UserMacros"> - <!-- WinXP = 0; Vista = 1; Win7 = 2; Win8 = 3... - Only 0 and 1 are used currently --> - <TargetOSLevel Condition="'$(PlatformToolset)'=='v120_xp' Or '$(PlatformToolset)'=='v140_xp'">0</TargetOSLevel> - <TargetOSLevel Condition="'$(PlatformToolset)'!='v120_xp' And '$(PlatformToolset)'!='v140_xp'">1</TargetOSLevel> - </PropertyGroup> - <PropertyGroup> - <IncludePath>$(MhdSrc)include;$(SolutionDir);$(IncludePath)</IncludePath> - <CustomBuildBeforeTargets>ResourceCompile</CustomBuildBeforeTargets> - </PropertyGroup> - <PropertyGroup Condition="'$(Platform)'=='Win32'"> - <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)Output\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Platform)'=='x64'"> - <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> - <OutDir>$(SolutionDir)Output\$(Platform)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> - <TargetName Condition="'$(UseDebugLibraries)'=='true'">$(ProjectName)_d</TargetName> - <TargetName Condition="'$(UseDebugLibraries)'!='true'">$(ProjectName)</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'"> - <TargetName Condition="'$(UseDebugLibraries)'=='true'">$(ProjectName)-dll_d</TargetName> - <TargetName Condition="'$(UseDebugLibraries)'!='true'">$(ProjectName)-dll</TargetName> - </PropertyGroup> + <Import Project="$(MhdW32Common)common-build-settings.vcxproj" /> + <Import Project="$(MhdW32Common)libmicrohttpd-build-settings.vcxproj" /> + <PropertyGroup /> <ItemDefinitionGroup> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;BUILDING_MHD_LIB;_UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors> - <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> - </ClCompile> - <Link> - <Subsystem>WINDOWS</Subsystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <CustomBuildStep> - <Message>Copy headers to output</Message> - <Command>xcopy /F /I /Y "$(MhdSrc)include\microhttpd.h" "$(OutputPath)"</Command> - <Outputs>$(OutputPath)microhttpd.h;%(Outputs)</Outputs> - <Inputs>$(MhdSrc)include\microhttpd.h</Inputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(TargetOSLevel)'>'0'"> - <ClCompile> - <PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <MinimumRequiredVersion>6.00</MinimumRequiredVersion> - <AdditionalOptions>/SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions)</AdditionalOptions> - </Link> - <Lib> - <MinimumRequiredVersion>6.00</MinimumRequiredVersion> - <AdditionalOptions>/SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions)</AdditionalOptions> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(TargetOSLevel)'=='0' And '$(Platform)'=='Win32'"> - <ClCompile> - <PreprocessorDefinitions>_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <MinimumRequiredVersion>5.01</MinimumRequiredVersion> - <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions> - </Link> - <Lib> - <MinimumRequiredVersion>5.01</MinimumRequiredVersion> - <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(TargetOSLevel)'=='0' And '$(Platform)'=='x64'"> - <ClCompile> - <PreprocessorDefinitions>_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <MinimumRequiredVersion>5.02</MinimumRequiredVersion> - <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions> - </Link> - <Lib> - <MinimumRequiredVersion>5.02</MinimumRequiredVersion> - <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> - <ClCompile> - <PreprocessorDefinitions>_LIB;MHD_W32LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Lib> - <AdditionalDependencies>Ws2_32.lib</AdditionalDependencies> - </Lib> - <PostBuildEvent> - <Command>xcopy /F /I /Y "$(IntermediateOutputPath)$(TargetName).pdb" "$(OutputPath)"</Command> - <Message>Copy .pdb to output directory</Message> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'"> - <ClCompile> - <PreprocessorDefinitions>_USRDLL;MHD_W32DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(UseDebugLibraries)'=='true'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <SmallerTypeCheck>true</SmallerTypeCheck> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(UseDebugLibraries)'!='true'"> - <ClCompile> - <Optimization>Full</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> - <ClCompile> - <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary> - <RuntimeLibrary Condition="'$(UseDebugLibraries)'!='true'">MultiThreaded</RuntimeLibrary> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'"> - <ClCompile> - <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebugDLL</RuntimeLibrary> - <RuntimeLibrary Condition="'$(UseDebugLibraries)'!='true'">MultiThreadedDLL</RuntimeLibrary> - </ClCompile> + <ClCompile /> + <Link /> + <Lib /> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/w32/VS2013/libmicrohttpd.vcxproj.filters b/w32/VS2013/libmicrohttpd.vcxproj.filters @@ -1,129 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <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> - <Filter Include="Source Files\platform_interface"> - <UniqueIdentifier>{af799bf7-9787-4134-8e56-9e5aae50c7e3}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Template Files"> - <UniqueIdentifier>{df5ad836-e372-437b-a0e3-299d3675d6b4}</UniqueIdentifier> - <Extensions>in</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MhdSrc)microhttpd\base64.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\basicauth.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\connection.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\daemon.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\digestauth.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\internal.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\md5.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\memorypool.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\postprocessor.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\reason_phrase.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\response.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)platform\w32functions.c"> - <Filter>Source Files\platform_interface</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\tsearch.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="$(MhdSrc)microhttpd\mhd_mono_clock.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MhdSrc)microhttpd\base64.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)microhttpd\connection.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)microhttpd\internal.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)microhttpd\md5.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)microhttpd\response.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)include\microhttpd.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)include\platform.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)include\platform_interface.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)include\w32functions.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="MHD_config.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h"> - <Filter>Source Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="$(MhdW32Common)microhttpd_dll_res_vc.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> - <ItemGroup> - <CustomBuild Include="$(MhdW32Common)microhttpd_dll_res_vc.rc.in"> - <Filter>Template Files</Filter> - </CustomBuild> - </ItemGroup> + <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> + <Import Project="$(MhdW32Common)libmicrohttpd-filters.vcxproj" /> </Project> \ No newline at end of file diff --git a/w32/VS2013/MHD_config.h b/w32/common/MHD_config.h diff --git a/w32/common/common-build-settings.vcxproj b/w32/common/common-build-settings.vcxproj @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="UserMacros"> + <!-- WinXP = 0; Vista = 1; Win7 = 2; Win8 = 3... + Only 0 and 1 are used currently --> + <TargetOSLevel Condition="'$(PlatformToolset)'=='v120_xp' Or '$(PlatformToolset)'=='v140_xp'">0</TargetOSLevel> + <TargetOSLevel Condition="'$(PlatformToolset)'!='v120_xp' And '$(PlatformToolset)'!='v140_xp'">1</TargetOSLevel> + </PropertyGroup> + <PropertyGroup> + <IncludePath>$(SolutionDir);$(MhdW32Common);$(MhdSrc)include;$(IncludePath)</IncludePath> + </PropertyGroup> + <PropertyGroup Condition="'$(Platform)'=='Win32'"> + <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\</IntDir> + <OutDir>$(SolutionDir)Output\</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Platform)'=='x64'"> + <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> + <OutDir>$(SolutionDir)Output\$(Platform)\</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(UseDebugLibraries)'=='true'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(UseDebugLibraries)'!='true'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> + <TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(TargetOSLevel)'>'0'"> + <ClCompile> + <PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <MinimumRequiredVersion>6.00</MinimumRequiredVersion> + </Link> + <Lib> + <MinimumRequiredVersion>6.00</MinimumRequiredVersion> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(TargetOSLevel)'=='0' And '$(Platform)'=='Win32'"> + <ClCompile> + <PreprocessorDefinitions>_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <MinimumRequiredVersion>5.01</MinimumRequiredVersion> + </Link> + <Lib> + <MinimumRequiredVersion>5.01</MinimumRequiredVersion> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(TargetOSLevel)'=='0' And '$(Platform)'=='x64'"> + <ClCompile> + <PreprocessorDefinitions>_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <MinimumRequiredVersion>5.02</MinimumRequiredVersion> + </Link> + <Lib> + <MinimumRequiredVersion>5.02</MinimumRequiredVersion> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(UseDebugLibraries)'=='true'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <SmallerTypeCheck>true</SmallerTypeCheck> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(UseDebugLibraries)'!='true'"> + <ClCompile> + <Optimization>Full</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <OmitFramePointers>true</OmitFramePointers> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + </ItemDefinitionGroup> +</Project> diff --git a/w32/common/hellobrowser-build-settings.vcxproj b/w32/common/hellobrowser-build-settings.vcxproj @@ -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> diff --git a/w32/common/hellobrowser-files.vcxproj b/w32/common/hellobrowser-files.vcxproj @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MhdRoot)doc\examples\hellobrowser.c" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="libmicrohttpd.vcxproj"> + <Project>{9cfb0342-a9e7-483e-bee5-a1de22584c5a}</Project> + </ProjectReference> + </ItemGroup> +</Project> diff --git a/w32/common/hellobrowser-filters.vcxproj b/w32/common/hellobrowser-filters.vcxproj @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <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"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> +</Project> diff --git a/w32/common/libmicrohttpd-build-settings.vcxproj b/w32/common/libmicrohttpd-build-settings.vcxproj @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <CustomBuildBeforeTargets>ResourceCompile</CustomBuildBeforeTargets> + </PropertyGroup> + <PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> + <TargetName Condition="'$(UseDebugLibraries)'=='true'">$(ProjectName)_d</TargetName> + <TargetName Condition="'$(UseDebugLibraries)'!='true'">$(ProjectName)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'"> + <TargetName Condition="'$(UseDebugLibraries)'=='true'">$(ProjectName)-dll_d</TargetName> + <TargetName Condition="'$(UseDebugLibraries)'!='true'">$(ProjectName)-dll</TargetName> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <PreprocessorDefinitions>BUILDING_MHD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <Subsystem>WINDOWS</Subsystem> + </Link> + <Lib> + <SubSystem>Windows</SubSystem> + </Lib> + <CustomBuildStep> + <Message>Copy headers to output</Message> + <Command>xcopy /F /I /Y "$(MhdSrc)include\microhttpd.h" "$(OutputPath)"</Command> + <Outputs>$(OutputPath)microhttpd.h;%(Outputs)</Outputs> + <Inputs>$(MhdSrc)include\microhttpd.h</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> + <ClCompile> + <PreprocessorDefinitions>_LIB;MHD_W32LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary Condition="'$(UseDebugLibraries)'!='true'">MultiThreaded</RuntimeLibrary> + </ClCompile> + <Lib> + <AdditionalDependencies>Ws2_32.lib</AdditionalDependencies> + </Lib> + <PostBuildEvent> + <Command>xcopy /F /I /Y "$(IntermediateOutputPath)$(TargetName).pdb" "$(OutputPath)"</Command> + <Message>Copy .pdb to output directory</Message> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'"> + <ClCompile> + <PreprocessorDefinitions>_USRDLL;MHD_W32DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebugDLL</RuntimeLibrary> + <RuntimeLibrary Condition="'$(UseDebugLibraries)'!='true'">MultiThreadedDLL</RuntimeLibrary> + </ClCompile> + <Link> + <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> +</Project> diff --git a/w32/common/libmicrohttpd-files.vcxproj b/w32/common/libmicrohttpd-files.vcxproj @@ -32,7 +32,7 @@ <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h" /> <ClInclude Include="$(MhdSrc)microhttpd\response.h" /> <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h" /> - <ClInclude Include="MHD_config.h" /> + <ClInclude Include="$(MhdW32Common)MHD_config.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="$(MhdW32Common)microhttpd_dll_res_vc.rc"> diff --git a/w32/common/libmicrohttpd-filters.vcxproj b/w32/common/libmicrohttpd-filters.vcxproj @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <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> + <Filter Include="Source Files\platform_interface"> + <UniqueIdentifier>{af799bf7-9787-4134-8e56-9e5aae50c7e3}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Template Files"> + <UniqueIdentifier>{df5ad836-e372-437b-a0e3-299d3675d6b4}</UniqueIdentifier> + <Extensions>in</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MhdSrc)microhttpd\base64.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\basicauth.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\connection.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\daemon.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\digestauth.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\internal.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\md5.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\memorypool.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\postprocessor.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\reason_phrase.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\response.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)platform\w32functions.c"> + <Filter>Source Files\platform_interface</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\tsearch.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="$(MhdSrc)microhttpd\mhd_mono_clock.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MhdSrc)microhttpd\base64.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)microhttpd\connection.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)microhttpd\internal.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)microhttpd\md5.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)microhttpd\response.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)include\microhttpd.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)include\platform.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)include\platform_interface.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)include\w32functions.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdW32Common)MHD_config.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h"> + <Filter>Source Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="$(MhdW32Common)microhttpd_dll_res_vc.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="$(MhdW32Common)microhttpd_dll_res_vc.rc.in"> + <Filter>Template Files</Filter> + </CustomBuild> + </ItemGroup> +</Project>