diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-12-03 11:52:52 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-12-03 11:52:52 +0000 |
commit | b86799bfaddeb938f59e277d937776b3d335be04 (patch) | |
tree | 3d4965204463da955f3c2a6cf00ce577fb86c1bd /w32/VS2013 | |
parent | 81aa9627013ef091d1691a814ee6c22bf23ad5da (diff) | |
download | libmicrohttpd-b86799bfaddeb938f59e277d937776b3d335be04.tar.gz libmicrohttpd-b86799bfaddeb938f59e277d937776b3d335be04.zip |
VS projects: optimizations, fixes, used macros for paths.
Diffstat (limited to 'w32/VS2013')
-rw-r--r-- | w32/VS2013/gen_dll_res.ps1 | 38 | ||||
-rw-r--r-- | w32/VS2013/hellobrowser.vcxproj | 9 | ||||
-rw-r--r-- | w32/VS2013/hellobrowser.vcxproj.filters | 2 | ||||
-rw-r--r-- | w32/VS2013/libmicrohttpd.vcxproj | 127 | ||||
-rw-r--r-- | w32/VS2013/libmicrohttpd.vcxproj.filters | 63 | ||||
-rw-r--r-- | w32/VS2013/microhttpd_dll_res_vc.rc.in | 42 |
6 files changed, 94 insertions, 187 deletions
diff --git a/w32/VS2013/gen_dll_res.ps1 b/w32/VS2013/gen_dll_res.ps1 deleted file mode 100644 index e51d1034..00000000 --- a/w32/VS2013/gen_dll_res.ps1 +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | param ([string]$BasePath = ".\") | ||
2 | |||
3 | $Host.SetShouldExit(111) # Set non-zero return code until task successfully finished | ||
4 | $ErrorActionPreference = "Stop" # Stop on any error | ||
5 | |||
6 | Remove-Variable MHD_ver,MHD_ver_major,MHD_ver_minor,MHD_ver_patchlev -ErrorAction:SilentlyContinue | ||
7 | |||
8 | Write-Output "Processing: ${BasePath}..\..\configure.ac" | ||
9 | foreach($line in Get-Content "${BasePath}..\..\configure.ac") | ||
10 | { | ||
11 | if ($line -match '^AC_INIT\(\[libmicrohttpd\],\[((\d+).(\d+).(\d+))\]') | ||
12 | { | ||
13 | [string]$MHD_ver = $Matches[1].ToString() | ||
14 | [string]$MHD_ver_major = $Matches[2].ToString() | ||
15 | [string]$MHD_ver_minor = $Matches[3].ToString() | ||
16 | [string]$MHD_ver_patchlev = $Matches[4].ToString() | ||
17 | break | ||
18 | } | ||
19 | } | ||
20 | if ("$MHD_ver" -eq "" -or "$MHD_ver_major" -eq "" -or "$MHD_ver_minor" -eq "" -or "$MHD_ver_patchlev" -eq "") | ||
21 | { | ||
22 | Throw "Can't find MHD version in ${BasePath}..\..\configure.ac" | ||
23 | } | ||
24 | |||
25 | Write-Output "Detected MHD version: $MHD_ver" | ||
26 | |||
27 | Write-Output "Generating ${BasePath}microhttpd_dll_res_vc.rc" | ||
28 | Get-Content "${BasePath}microhttpd_dll_res_vc.rc.in" | ForEach-Object { | ||
29 | $_ -replace '@PACKAGE_VERSION_MAJOR@',"$MHD_ver_major" ` | ||
30 | -replace '@PACKAGE_VERSION_MINOR@', "$MHD_ver_minor" ` | ||
31 | -replace '@PACKAGE_VERSION_SUBMINOR@', "$MHD_ver_patchlev" ` | ||
32 | -replace '@PACKAGE_VERSION@', "$MHD_ver" | ||
33 | } | Out-File -FilePath "${BasePath}microhttpd_dll_res_vc.rc" -Force | ||
34 | |||
35 | $Host.SetShouldExit(0) # Reset return code | ||
36 | |||
37 | Write-Output "${BasePath}microhttpd_dll_res_vc.rc was generated " | ||
38 | exit 0 # Exit with success code | ||
diff --git a/w32/VS2013/hellobrowser.vcxproj b/w32/VS2013/hellobrowser.vcxproj index df9d826f..448b21db 100644 --- a/w32/VS2013/hellobrowser.vcxproj +++ b/w32/VS2013/hellobrowser.vcxproj | |||
@@ -1,5 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
3 | <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> | ||
3 | <ItemGroup Label="ProjectConfigurations"> | 4 | <ItemGroup Label="ProjectConfigurations"> |
4 | <ProjectConfiguration Include="Debug-dll|Win32"> | 5 | <ProjectConfiguration Include="Debug-dll|Win32"> |
5 | <Configuration>Debug-dll</Configuration> | 6 | <Configuration>Debug-dll</Configuration> |
@@ -35,7 +36,7 @@ | |||
35 | </ProjectConfiguration> | 36 | </ProjectConfiguration> |
36 | </ItemGroup> | 37 | </ItemGroup> |
37 | <ItemGroup> | 38 | <ItemGroup> |
38 | <ClCompile Include="..\..\doc\examples\hellobrowser.c" /> | 39 | <ClCompile Include="$(MhdRoot)doc\examples\hellobrowser.c" /> |
39 | </ItemGroup> | 40 | </ItemGroup> |
40 | <PropertyGroup Label="Globals"> | 41 | <PropertyGroup Label="Globals"> |
41 | <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid> | 42 | <ProjectGuid>{310F39BD-A2D6-44FF-8344-37ADD0524CBD}</ProjectGuid> |
@@ -77,15 +78,15 @@ | |||
77 | </ImportGroup> | 78 | </ImportGroup> |
78 | <PropertyGroup Label="UserMacros" /> | 79 | <PropertyGroup Label="UserMacros" /> |
79 | <PropertyGroup> | 80 | <PropertyGroup> |
80 | <IncludePath>$(SolutionDir)..\..\src\include;$(SolutionDir);$(IncludePath)</IncludePath> | 81 | <IncludePath>$(MhdSrc)include;$(SolutionDir);$(IncludePath)</IncludePath> |
81 | </PropertyGroup> | 82 | </PropertyGroup> |
82 | <PropertyGroup Condition="'$(Platform)'=='Win32'"> | 83 | <PropertyGroup Condition="'$(Platform)'=='Win32'"> |
83 | <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\</IntDir> | 84 | <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\</IntDir> |
84 | <OutDir>$(SolutionDir)\Output\</OutDir> | 85 | <OutDir>$(SolutionDir)Output\</OutDir> |
85 | </PropertyGroup> | 86 | </PropertyGroup> |
86 | <PropertyGroup Condition="'$(Platform)'=='x64'"> | 87 | <PropertyGroup Condition="'$(Platform)'=='x64'"> |
87 | <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> | 88 | <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> |
88 | <OutDir>$(SolutionDir)\Output\$(Platform)\</OutDir> | 89 | <OutDir>$(SolutionDir)Output\$(Platform)\</OutDir> |
89 | </PropertyGroup> | 90 | </PropertyGroup> |
90 | <PropertyGroup Condition="'$(UseDebugLibraries)'=='true'"> | 91 | <PropertyGroup Condition="'$(UseDebugLibraries)'=='true'"> |
91 | <LinkIncremental>true</LinkIncremental> | 92 | <LinkIncremental>true</LinkIncremental> |
diff --git a/w32/VS2013/hellobrowser.vcxproj.filters b/w32/VS2013/hellobrowser.vcxproj.filters index 0e1e02f4..fd1e1f8b 100644 --- a/w32/VS2013/hellobrowser.vcxproj.filters +++ b/w32/VS2013/hellobrowser.vcxproj.filters | |||
@@ -15,7 +15,7 @@ | |||
15 | </Filter> | 15 | </Filter> |
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | <ItemGroup> | 17 | <ItemGroup> |
18 | <ClCompile Include="..\..\doc\examples\hellobrowser.c"> | 18 | <ClCompile Include="$(MhdRoot)doc\examples\hellobrowser.c"> |
19 | <Filter>Source Files</Filter> | 19 | <Filter>Source Files</Filter> |
20 | </ClCompile> | 20 | </ClCompile> |
21 | </ItemGroup> | 21 | </ItemGroup> |
diff --git a/w32/VS2013/libmicrohttpd.vcxproj b/w32/VS2013/libmicrohttpd.vcxproj index 2f8b4756..6e79709f 100644 --- a/w32/VS2013/libmicrohttpd.vcxproj +++ b/w32/VS2013/libmicrohttpd.vcxproj | |||
@@ -1,5 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
3 | <Import Project="$(SolutionDir)..\common\vs_dirs.props" /> | ||
3 | <ItemGroup Label="ProjectConfigurations"> | 4 | <ItemGroup Label="ProjectConfigurations"> |
4 | <ProjectConfiguration Include="Debug-dll-xp|Win32"> | 5 | <ProjectConfiguration Include="Debug-dll-xp|Win32"> |
5 | <Configuration>Debug-dll-xp</Configuration> | 6 | <Configuration>Debug-dll-xp</Configuration> |
@@ -67,74 +68,53 @@ | |||
67 | </ProjectConfiguration> | 68 | </ProjectConfiguration> |
68 | </ItemGroup> | 69 | </ItemGroup> |
69 | <ItemGroup> | 70 | <ItemGroup> |
70 | <ClCompile Include="..\..\src\microhttpd\base64.c" /> | 71 | <ClCompile Include="$(MhdSrc)microhttpd\base64.c" /> |
71 | <ClCompile Include="..\..\src\microhttpd\basicauth.c" /> | 72 | <ClCompile Include="$(MhdSrc)microhttpd\basicauth.c" /> |
72 | <ClCompile Include="..\..\src\microhttpd\connection.c" /> | 73 | <ClCompile Include="$(MhdSrc)microhttpd\connection.c" /> |
73 | <ClCompile Include="..\..\src\microhttpd\daemon.c" /> | 74 | <ClCompile Include="$(MhdSrc)microhttpd\daemon.c" /> |
74 | <ClCompile Include="..\..\src\microhttpd\digestauth.c" /> | 75 | <ClCompile Include="$(MhdSrc)microhttpd\digestauth.c" /> |
75 | <ClCompile Include="..\..\src\microhttpd\internal.c" /> | 76 | <ClCompile Include="$(MhdSrc)microhttpd\internal.c" /> |
76 | <ClCompile Include="..\..\src\microhttpd\md5.c" /> | 77 | <ClCompile Include="$(MhdSrc)microhttpd\md5.c" /> |
77 | <ClCompile Include="..\..\src\microhttpd\memorypool.c" /> | 78 | <ClCompile Include="$(MhdSrc)microhttpd\memorypool.c" /> |
78 | <ClCompile Include="..\..\src\microhttpd\mhd_mono_clock.c" /> | 79 | <ClCompile Include="$(MhdSrc)microhttpd\mhd_mono_clock.c" /> |
79 | <ClCompile Include="..\..\src\microhttpd\postprocessor.c" /> | 80 | <ClCompile Include="$(MhdSrc)microhttpd\postprocessor.c" /> |
80 | <ClCompile Include="..\..\src\microhttpd\reason_phrase.c" /> | 81 | <ClCompile Include="$(MhdSrc)microhttpd\reason_phrase.c" /> |
81 | <ClCompile Include="..\..\src\microhttpd\response.c" /> | 82 | <ClCompile Include="$(MhdSrc)microhttpd\response.c" /> |
82 | <ClCompile Include="..\..\src\microhttpd\tsearch.c" /> | 83 | <ClCompile Include="$(MhdSrc)microhttpd\tsearch.c" /> |
83 | <ClCompile Include="..\..\src\platform\w32functions.c" /> | 84 | <ClCompile Include="$(MhdSrc)platform\w32functions.c" /> |
84 | </ItemGroup> | 85 | </ItemGroup> |
85 | <ItemGroup> | 86 | <ItemGroup> |
86 | <ClInclude Include="..\..\src\include\autoinit_funcs.h" /> | 87 | <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h" /> |
87 | <ClInclude Include="..\..\src\include\microhttpd.h" /> | 88 | <ClInclude Include="$(MhdSrc)include\microhttpd.h" /> |
88 | <ClInclude Include="..\..\src\include\platform.h" /> | 89 | <ClInclude Include="$(MhdSrc)include\platform.h" /> |
89 | <ClInclude Include="..\..\src\include\platform_interface.h" /> | 90 | <ClInclude Include="$(MhdSrc)include\platform_interface.h" /> |
90 | <ClInclude Include="..\..\src\include\w32functions.h" /> | 91 | <ClInclude Include="$(MhdSrc)include\w32functions.h" /> |
91 | <ClInclude Include="..\..\src\microhttpd\base64.h" /> | 92 | <ClInclude Include="$(MhdSrc)microhttpd\base64.h" /> |
92 | <ClInclude Include="..\..\src\microhttpd\connection.h" /> | 93 | <ClInclude Include="$(MhdSrc)microhttpd\connection.h" /> |
93 | <ClInclude Include="..\..\src\microhttpd\internal.h" /> | 94 | <ClInclude Include="$(MhdSrc)microhttpd\internal.h" /> |
94 | <ClInclude Include="..\..\src\microhttpd\md5.h" /> | 95 | <ClInclude Include="$(MhdSrc)microhttpd\md5.h" /> |
95 | <ClInclude Include="..\..\src\microhttpd\memorypool.h" /> | 96 | <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h" /> |
96 | <ClInclude Include="..\..\src\microhttpd\mhd_byteorder.h" /> | 97 | <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h" /> |
97 | <ClInclude Include="..\..\src\microhttpd\mhd_limits.h" /> | 98 | <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h" /> |
98 | <ClInclude Include="..\..\src\microhttpd\mhd_mono_clock.h" /> | 99 | <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h" /> |
99 | <ClInclude Include="..\..\src\microhttpd\response.h" /> | 100 | <ClInclude Include="$(MhdSrc)microhttpd\response.h" /> |
100 | <ClInclude Include="..\..\src\microhttpd\tsearch.h" /> | 101 | <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h" /> |
101 | <ClInclude Include="MHD_config.h" /> | 102 | <ClInclude Include="MHD_config.h" /> |
102 | </ItemGroup> | 103 | </ItemGroup> |
103 | <ItemGroup> | 104 | <ItemGroup> |
104 | <ResourceCompile Include="microhttpd_dll_res_vc.rc"> | 105 | <ResourceCompile Include="$(MhdW32Common)microhttpd_dll_res_vc.rc"> |
105 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-static|Win32'">true</ExcludedFromBuild> | 106 | <ExcludedFromBuild Condition="'$(ConfigurationType)'=='StaticLibrary'">true</ExcludedFromBuild> |
106 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-static-xp|Win32'">true</ExcludedFromBuild> | ||
107 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-static|Win32'">true</ExcludedFromBuild> | ||
108 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-static-xp|Win32'">true</ExcludedFromBuild> | ||
109 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-static|x64'">true</ExcludedFromBuild> | ||
110 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-static-xp|x64'">true</ExcludedFromBuild> | ||
111 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-static|x64'">true</ExcludedFromBuild> | ||
112 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-static-xp|x64'">true</ExcludedFromBuild> | ||
113 | </ResourceCompile> | 107 | </ResourceCompile> |
114 | </ItemGroup> | 108 | </ItemGroup> |
115 | <ItemGroup> | 109 | <ItemGroup> |
116 | <CustomBuild Include="microhttpd_dll_res_vc.rc.in"> | 110 | <CustomBuild Include="$(MhdW32Common)microhttpd_dll_res_vc.rc.in"> |
117 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-static|Win32'">true</ExcludedFromBuild> | 111 | <ExcludedFromBuild Condition="'$(ConfigurationType)'=='StaticLibrary'">true</ExcludedFromBuild> |
118 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-static-xp|Win32'">true</ExcludedFromBuild> | 112 | <ExcludedFromBuild Condition="'$(ConfigurationType)'=='DynamicLibrary'">false</ExcludedFromBuild> |
119 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-static|Win32'">true</ExcludedFromBuild> | ||
120 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-static-xp|Win32'">true</ExcludedFromBuild> | ||
121 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-static|x64'">true</ExcludedFromBuild> | ||
122 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-static-xp|x64'">true</ExcludedFromBuild> | ||
123 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-static|x64'">true</ExcludedFromBuild> | ||
124 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-static-xp|x64'">true</ExcludedFromBuild> | ||
125 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-dll|Win32'">false</ExcludedFromBuild> | ||
126 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-dll-xp|Win32'">false</ExcludedFromBuild> | ||
127 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-dll|x64'">false</ExcludedFromBuild> | ||
128 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-dll-xp|x64'">false</ExcludedFromBuild> | ||
129 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-dll|Win32'">false</ExcludedFromBuild> | ||
130 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-dll-xp|Win32'">false</ExcludedFromBuild> | ||
131 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-dll|x64'">false</ExcludedFromBuild> | ||
132 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-dll-xp|x64'">false</ExcludedFromBuild> | ||
133 | <FileType>Document</FileType> | 113 | <FileType>Document</FileType> |
134 | <Command>PowerShell.exe -Version 3.0 -NonInteractive -NoProfile -ExecutionPolicy Bypass -File "$(SolutionDir)gen_dll_res.ps1" -BasePath $(SolutionDir)</Command> | 114 | <Command>PowerShell.exe -Version 3.0 -NonInteractive -NoProfile -ExecutionPolicy Bypass -File "$(MhdW32Common)gen_dll_res.ps1" -BasePath "$(MhdW32Common)\"</Command> |
135 | <Message>Generating .dll description resource</Message> | 115 | <Message>Generating .dll description resource</Message> |
136 | <Outputs>$(SolutionDir)microhttpd_dll_res_vc.rc</Outputs> | 116 | <Outputs>$(MhdW32Common)microhttpd_dll_res_vc.rc</Outputs> |
137 | <AdditionalInputs>$(SolutionDir)gen_dll_res.ps1;$(SolutionDir).\..\..\configure.ac</AdditionalInputs> | 117 | <AdditionalInputs>$(MhdW32Common)gen_dll_res.ps1;$(MhdRoot)configure.ac</AdditionalInputs> |
138 | </CustomBuild> | 118 | </CustomBuild> |
139 | </ItemGroup> | 119 | </ItemGroup> |
140 | <PropertyGroup Label="Globals"> | 120 | <PropertyGroup Label="Globals"> |
@@ -204,20 +184,20 @@ | |||
204 | <PropertyGroup Label="UserMacros"> | 184 | <PropertyGroup Label="UserMacros"> |
205 | <!-- WinXP = 0; Vista = 1; Win7 = 2; Win8 = 3... | 185 | <!-- WinXP = 0; Vista = 1; Win7 = 2; Win8 = 3... |
206 | Only 0 and 1 are used currently --> | 186 | Only 0 and 1 are used currently --> |
207 | <TargetOSLevel Condition="'$(PlatformToolset)'=='v120_xp'">0</TargetOSLevel> | 187 | <TargetOSLevel Condition="'$(PlatformToolset)'=='v120_xp' Or '$(PlatformToolset)'=='v140_xp'">0</TargetOSLevel> |
208 | <TargetOSLevel Condition="'$(PlatformToolset)'!='v120_xp'">1</TargetOSLevel> | 188 | <TargetOSLevel Condition="'$(PlatformToolset)'!='v120_xp' And '$(PlatformToolset)'!='v140_xp'">1</TargetOSLevel> |
209 | </PropertyGroup> | 189 | </PropertyGroup> |
210 | <PropertyGroup> | 190 | <PropertyGroup> |
211 | <IncludePath>$(SolutionDir)..\..\src\include;$(SolutionDir);$(IncludePath)</IncludePath> | 191 | <IncludePath>$(MhdSrc)include;$(SolutionDir);$(IncludePath)</IncludePath> |
212 | <CustomBuildBeforeTargets>ResourceCompile</CustomBuildBeforeTargets> | 192 | <CustomBuildBeforeTargets>ResourceCompile</CustomBuildBeforeTargets> |
213 | </PropertyGroup> | 193 | </PropertyGroup> |
214 | <PropertyGroup Condition="'$(Platform)'=='Win32'"> | 194 | <PropertyGroup Condition="'$(Platform)'=='Win32'"> |
215 | <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\</IntDir> | 195 | <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\</IntDir> |
216 | <OutDir>$(SolutionDir)\Output\</OutDir> | 196 | <OutDir>$(SolutionDir)Output\</OutDir> |
217 | </PropertyGroup> | 197 | </PropertyGroup> |
218 | <PropertyGroup Condition="'$(Platform)'=='x64'"> | 198 | <PropertyGroup Condition="'$(Platform)'=='x64'"> |
219 | <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> | 199 | <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> |
220 | <OutDir>$(SolutionDir)\Output\$(Platform)\</OutDir> | 200 | <OutDir>$(SolutionDir)Output\$(Platform)\</OutDir> |
221 | </PropertyGroup> | 201 | </PropertyGroup> |
222 | <PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> | 202 | <PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> |
223 | <TargetName Condition="'$(UseDebugLibraries)'=='true'">$(ProjectName)_d</TargetName> | 203 | <TargetName Condition="'$(UseDebugLibraries)'=='true'">$(ProjectName)_d</TargetName> |
@@ -243,9 +223,9 @@ | |||
243 | </Link> | 223 | </Link> |
244 | <CustomBuildStep> | 224 | <CustomBuildStep> |
245 | <Message>Copy headers to output</Message> | 225 | <Message>Copy headers to output</Message> |
246 | <Command>xcopy /F /I /Y $(SolutionDir)\..\..\src\include\microhttpd.h $(OutputPath)</Command> | 226 | <Command>xcopy /F /I /Y "$(MhdSrc)include\microhttpd.h" "$(OutputPath)"</Command> |
247 | <Outputs>$(OutputPath)microhttpd.h;%(Outputs)</Outputs> | 227 | <Outputs>$(OutputPath)microhttpd.h;%(Outputs)</Outputs> |
248 | <Inputs>$(SolutionDir)\..\..\src\include\microhttpd.h</Inputs> | 228 | <Inputs>$(MhdSrc)include\microhttpd.h</Inputs> |
249 | </CustomBuildStep> | 229 | </CustomBuildStep> |
250 | </ItemDefinitionGroup> | 230 | </ItemDefinitionGroup> |
251 | <ItemDefinitionGroup Condition="'$(TargetOSLevel)'>'0'"> | 231 | <ItemDefinitionGroup Condition="'$(TargetOSLevel)'>'0'"> |
@@ -261,23 +241,28 @@ | |||
261 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions)</AdditionalOptions> | 241 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions)</AdditionalOptions> |
262 | </Lib> | 242 | </Lib> |
263 | </ItemDefinitionGroup> | 243 | </ItemDefinitionGroup> |
264 | <ItemDefinitionGroup Condition="'$(TargetOSLevel)'=='0'"> | 244 | <ItemDefinitionGroup Condition="'$(TargetOSLevel)'=='0' And '$(Platform)'=='Win32'"> |
265 | <ClCompile> | 245 | <ClCompile> |
266 | <PreprocessorDefinitions>_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 246 | <PreprocessorDefinitions>_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
267 | </ClCompile> | 247 | </ClCompile> |
268 | <Link Condition="'$(Platform)'=='Win32'"> | 248 | <Link> |
269 | <MinimumRequiredVersion>5.01</MinimumRequiredVersion> | 249 | <MinimumRequiredVersion>5.01</MinimumRequiredVersion> |
270 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions> | 250 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions> |
271 | </Link> | 251 | </Link> |
272 | <Lib Condition="'$(Platform)'=='Win32'"> | 252 | <Lib> |
273 | <MinimumRequiredVersion>5.01</MinimumRequiredVersion> | 253 | <MinimumRequiredVersion>5.01</MinimumRequiredVersion> |
274 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions> | 254 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions> |
275 | </Lib> | 255 | </Lib> |
276 | <Link Condition="'$(Platform)'=='x64'"> | 256 | </ItemDefinitionGroup> |
257 | <ItemDefinitionGroup Condition="'$(TargetOSLevel)'=='0' And '$(Platform)'=='x64'"> | ||
258 | <ClCompile> | ||
259 | <PreprocessorDefinitions>_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
260 | </ClCompile> | ||
261 | <Link> | ||
277 | <MinimumRequiredVersion>5.02</MinimumRequiredVersion> | 262 | <MinimumRequiredVersion>5.02</MinimumRequiredVersion> |
278 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions> | 263 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions> |
279 | </Link> | 264 | </Link> |
280 | <Lib Condition="'$(Platform)'=='x64'"> | 265 | <Lib> |
281 | <MinimumRequiredVersion>5.02</MinimumRequiredVersion> | 266 | <MinimumRequiredVersion>5.02</MinimumRequiredVersion> |
282 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions> | 267 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions> |
283 | </Lib> | 268 | </Lib> |
@@ -290,7 +275,7 @@ | |||
290 | <AdditionalDependencies>Ws2_32.lib</AdditionalDependencies> | 275 | <AdditionalDependencies>Ws2_32.lib</AdditionalDependencies> |
291 | </Lib> | 276 | </Lib> |
292 | <PostBuildEvent> | 277 | <PostBuildEvent> |
293 | <Command>xcopy /F /I /Y $(IntermediateOutputPath)$(TargetName).pdb $(OutputPath)</Command> | 278 | <Command>xcopy /F /I /Y "$(IntermediateOutputPath)$(TargetName).pdb" "$(OutputPath)"</Command> |
294 | <Message>Copy .pdb to output directory</Message> | 279 | <Message>Copy .pdb to output directory</Message> |
295 | </PostBuildEvent> | 280 | </PostBuildEvent> |
296 | </ItemDefinitionGroup> | 281 | </ItemDefinitionGroup> |
diff --git a/w32/VS2013/libmicrohttpd.vcxproj.filters b/w32/VS2013/libmicrohttpd.vcxproj.filters index 6dd69e3f..fd5796c5 100644 --- a/w32/VS2013/libmicrohttpd.vcxproj.filters +++ b/w32/VS2013/libmicrohttpd.vcxproj.filters | |||
@@ -15,6 +15,7 @@ | |||
15 | </Filter> | 15 | </Filter> |
16 | <Filter Include="Source Files\platform_interface"> | 16 | <Filter Include="Source Files\platform_interface"> |
17 | <UniqueIdentifier>{af799bf7-9787-4134-8e56-9e5aae50c7e3}</UniqueIdentifier> | 17 | <UniqueIdentifier>{af799bf7-9787-4134-8e56-9e5aae50c7e3}</UniqueIdentifier> |
18 | <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> | ||
18 | </Filter> | 19 | </Filter> |
19 | <Filter Include="Template Files"> | 20 | <Filter Include="Template Files"> |
20 | <UniqueIdentifier>{df5ad836-e372-437b-a0e3-299d3675d6b4}</UniqueIdentifier> | 21 | <UniqueIdentifier>{df5ad836-e372-437b-a0e3-299d3675d6b4}</UniqueIdentifier> |
@@ -22,106 +23,106 @@ | |||
22 | </Filter> | 23 | </Filter> |
23 | </ItemGroup> | 24 | </ItemGroup> |
24 | <ItemGroup> | 25 | <ItemGroup> |
25 | <ClCompile Include="..\..\src\microhttpd\base64.c"> | 26 | <ClCompile Include="$(MhdSrc)microhttpd\base64.c"> |
26 | <Filter>Source Files</Filter> | 27 | <Filter>Source Files</Filter> |
27 | </ClCompile> | 28 | </ClCompile> |
28 | <ClCompile Include="..\..\src\microhttpd\basicauth.c"> | 29 | <ClCompile Include="$(MhdSrc)microhttpd\basicauth.c"> |
29 | <Filter>Source Files</Filter> | 30 | <Filter>Source Files</Filter> |
30 | </ClCompile> | 31 | </ClCompile> |
31 | <ClCompile Include="..\..\src\microhttpd\connection.c"> | 32 | <ClCompile Include="$(MhdSrc)microhttpd\connection.c"> |
32 | <Filter>Source Files</Filter> | 33 | <Filter>Source Files</Filter> |
33 | </ClCompile> | 34 | </ClCompile> |
34 | <ClCompile Include="..\..\src\microhttpd\daemon.c"> | 35 | <ClCompile Include="$(MhdSrc)microhttpd\daemon.c"> |
35 | <Filter>Source Files</Filter> | 36 | <Filter>Source Files</Filter> |
36 | </ClCompile> | 37 | </ClCompile> |
37 | <ClCompile Include="..\..\src\microhttpd\digestauth.c"> | 38 | <ClCompile Include="$(MhdSrc)microhttpd\digestauth.c"> |
38 | <Filter>Source Files</Filter> | 39 | <Filter>Source Files</Filter> |
39 | </ClCompile> | 40 | </ClCompile> |
40 | <ClCompile Include="..\..\src\microhttpd\internal.c"> | 41 | <ClCompile Include="$(MhdSrc)microhttpd\internal.c"> |
41 | <Filter>Source Files</Filter> | 42 | <Filter>Source Files</Filter> |
42 | </ClCompile> | 43 | </ClCompile> |
43 | <ClCompile Include="..\..\src\microhttpd\md5.c"> | 44 | <ClCompile Include="$(MhdSrc)microhttpd\md5.c"> |
44 | <Filter>Source Files</Filter> | 45 | <Filter>Source Files</Filter> |
45 | </ClCompile> | 46 | </ClCompile> |
46 | <ClCompile Include="..\..\src\microhttpd\memorypool.c"> | 47 | <ClCompile Include="$(MhdSrc)microhttpd\memorypool.c"> |
47 | <Filter>Source Files</Filter> | 48 | <Filter>Source Files</Filter> |
48 | </ClCompile> | 49 | </ClCompile> |
49 | <ClCompile Include="..\..\src\microhttpd\postprocessor.c"> | 50 | <ClCompile Include="$(MhdSrc)microhttpd\postprocessor.c"> |
50 | <Filter>Source Files</Filter> | 51 | <Filter>Source Files</Filter> |
51 | </ClCompile> | 52 | </ClCompile> |
52 | <ClCompile Include="..\..\src\microhttpd\reason_phrase.c"> | 53 | <ClCompile Include="$(MhdSrc)microhttpd\reason_phrase.c"> |
53 | <Filter>Source Files</Filter> | 54 | <Filter>Source Files</Filter> |
54 | </ClCompile> | 55 | </ClCompile> |
55 | <ClCompile Include="..\..\src\microhttpd\response.c"> | 56 | <ClCompile Include="$(MhdSrc)microhttpd\response.c"> |
56 | <Filter>Source Files</Filter> | 57 | <Filter>Source Files</Filter> |
57 | </ClCompile> | 58 | </ClCompile> |
58 | <ClCompile Include="..\..\src\platform\w32functions.c"> | 59 | <ClCompile Include="$(MhdSrc)platform\w32functions.c"> |
59 | <Filter>Source Files\platform_interface</Filter> | 60 | <Filter>Source Files\platform_interface</Filter> |
60 | </ClCompile> | 61 | </ClCompile> |
61 | <ClCompile Include="..\..\src\microhttpd\tsearch.c"> | 62 | <ClCompile Include="$(MhdSrc)microhttpd\tsearch.c"> |
62 | <Filter>Source Files</Filter> | 63 | <Filter>Source Files</Filter> |
63 | </ClCompile> | 64 | </ClCompile> |
64 | <ClCompile Include="..\..\src\microhttpd\mhd_mono_clock.c"> | 65 | <ClCompile Include="$(MhdSrc)microhttpd\mhd_mono_clock.c"> |
65 | <Filter>Source Files</Filter> | 66 | <Filter>Source Files</Filter> |
66 | </ClCompile> | 67 | </ClCompile> |
67 | </ItemGroup> | 68 | </ItemGroup> |
68 | <ItemGroup> | 69 | <ItemGroup> |
69 | <ClInclude Include="..\..\src\microhttpd\base64.h"> | 70 | <ClInclude Include="$(MhdSrc)microhttpd\base64.h"> |
70 | <Filter>Source Files</Filter> | 71 | <Filter>Source Files</Filter> |
71 | </ClInclude> | 72 | </ClInclude> |
72 | <ClInclude Include="..\..\src\microhttpd\connection.h"> | 73 | <ClInclude Include="$(MhdSrc)microhttpd\connection.h"> |
73 | <Filter>Source Files</Filter> | 74 | <Filter>Source Files</Filter> |
74 | </ClInclude> | 75 | </ClInclude> |
75 | <ClInclude Include="..\..\src\microhttpd\internal.h"> | 76 | <ClInclude Include="$(MhdSrc)microhttpd\internal.h"> |
76 | <Filter>Source Files</Filter> | 77 | <Filter>Source Files</Filter> |
77 | </ClInclude> | 78 | </ClInclude> |
78 | <ClInclude Include="..\..\src\microhttpd\md5.h"> | 79 | <ClInclude Include="$(MhdSrc)microhttpd\md5.h"> |
79 | <Filter>Source Files</Filter> | 80 | <Filter>Source Files</Filter> |
80 | </ClInclude> | 81 | </ClInclude> |
81 | <ClInclude Include="..\..\src\microhttpd\memorypool.h"> | 82 | <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h"> |
82 | <Filter>Source Files</Filter> | 83 | <Filter>Source Files</Filter> |
83 | </ClInclude> | 84 | </ClInclude> |
84 | <ClInclude Include="..\..\src\microhttpd\response.h"> | 85 | <ClInclude Include="$(MhdSrc)microhttpd\response.h"> |
85 | <Filter>Source Files</Filter> | 86 | <Filter>Source Files</Filter> |
86 | </ClInclude> | 87 | </ClInclude> |
87 | <ClInclude Include="..\..\src\include\microhttpd.h"> | 88 | <ClInclude Include="$(MhdSrc)include\microhttpd.h"> |
88 | <Filter>Header Files</Filter> | 89 | <Filter>Header Files</Filter> |
89 | </ClInclude> | 90 | </ClInclude> |
90 | <ClInclude Include="..\..\src\include\platform.h"> | 91 | <ClInclude Include="$(MhdSrc)include\platform.h"> |
91 | <Filter>Header Files</Filter> | 92 | <Filter>Header Files</Filter> |
92 | </ClInclude> | 93 | </ClInclude> |
93 | <ClInclude Include="..\..\src\include\platform_interface.h"> | 94 | <ClInclude Include="$(MhdSrc)include\platform_interface.h"> |
94 | <Filter>Header Files</Filter> | 95 | <Filter>Header Files</Filter> |
95 | </ClInclude> | 96 | </ClInclude> |
96 | <ClInclude Include="..\..\src\include\w32functions.h"> | 97 | <ClInclude Include="$(MhdSrc)include\w32functions.h"> |
97 | <Filter>Header Files</Filter> | 98 | <Filter>Header Files</Filter> |
98 | </ClInclude> | 99 | </ClInclude> |
99 | <ClInclude Include="MHD_config.h"> | 100 | <ClInclude Include="MHD_config.h"> |
100 | <Filter>Header Files</Filter> | 101 | <Filter>Header Files</Filter> |
101 | </ClInclude> | 102 | </ClInclude> |
102 | <ClInclude Include="..\..\src\microhttpd\tsearch.h"> | 103 | <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h"> |
103 | <Filter>Source Files</Filter> | 104 | <Filter>Source Files</Filter> |
104 | </ClInclude> | 105 | </ClInclude> |
105 | <ClInclude Include="..\..\src\include\autoinit_funcs.h"> | 106 | <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h"> |
106 | <Filter>Header Files</Filter> | 107 | <Filter>Header Files</Filter> |
107 | </ClInclude> | 108 | </ClInclude> |
108 | <ClInclude Include="..\..\src\microhttpd\mhd_limits.h"> | 109 | <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h"> |
109 | <Filter>Source Files</Filter> | 110 | <Filter>Source Files</Filter> |
110 | </ClInclude> | 111 | </ClInclude> |
111 | <ClInclude Include="..\..\src\microhttpd\mhd_byteorder.h"> | 112 | <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h"> |
112 | <Filter>Source Files</Filter> | 113 | <Filter>Source Files</Filter> |
113 | </ClInclude> | 114 | </ClInclude> |
114 | <ClInclude Include="..\..\src\microhttpd\mhd_mono_clock.h"> | 115 | <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h"> |
115 | <Filter>Source Files</Filter> | 116 | <Filter>Source Files</Filter> |
116 | </ClInclude> | 117 | </ClInclude> |
117 | </ItemGroup> | 118 | </ItemGroup> |
118 | <ItemGroup> | 119 | <ItemGroup> |
119 | <ResourceCompile Include="microhttpd_dll_res_vc.rc"> | 120 | <ResourceCompile Include="$(MhdW32Common)microhttpd_dll_res_vc.rc"> |
120 | <Filter>Resource Files</Filter> | 121 | <Filter>Resource Files</Filter> |
121 | </ResourceCompile> | 122 | </ResourceCompile> |
122 | </ItemGroup> | 123 | </ItemGroup> |
123 | <ItemGroup> | 124 | <ItemGroup> |
124 | <CustomBuild Include="microhttpd_dll_res_vc.rc.in"> | 125 | <CustomBuild Include="$(MhdW32Common)microhttpd_dll_res_vc.rc.in"> |
125 | <Filter>Template Files</Filter> | 126 | <Filter>Template Files</Filter> |
126 | </CustomBuild> | 127 | </CustomBuild> |
127 | </ItemGroup> | 128 | </ItemGroup> |
diff --git a/w32/VS2013/microhttpd_dll_res_vc.rc.in b/w32/VS2013/microhttpd_dll_res_vc.rc.in deleted file mode 100644 index 19eb37cb..00000000 --- a/w32/VS2013/microhttpd_dll_res_vc.rc.in +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | /* W32 resources for .dll */ | ||
2 | |||
3 | #include <winresrc.h> | ||
4 | |||
5 | LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US | ||
6 | VS_VERSION_INFO VERSIONINFO | ||
7 | FILEVERSION @PACKAGE_VERSION_MAJOR@,@PACKAGE_VERSION_MINOR@,@PACKAGE_VERSION_SUBMINOR@,0 | ||
8 | PRODUCTVERSION @PACKAGE_VERSION_MAJOR@,@PACKAGE_VERSION_MINOR@,@PACKAGE_VERSION_SUBMINOR@,0 | ||
9 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | ||
10 | #if defined(_DEBUG) | ||
11 | FILEFLAGS VS_FF_DEBUG | ||
12 | #else | ||
13 | FILEFLAGS 0 | ||
14 | #endif | ||
15 | FILEOS VOS_NT_WINDOWS32 | ||
16 | FILETYPE VFT_DLL | ||
17 | FILESUBTYPE VFT2_UNKNOWN | ||
18 | BEGIN | ||
19 | BLOCK "StringFileInfo" | ||
20 | BEGIN | ||
21 | BLOCK "04090000" /* Lang = US English, Charset = ASCII */ | ||
22 | BEGIN | ||
23 | VALUE "ProductName", "GNU libmicrohttpd\0" | ||
24 | VALUE "ProductVersion", "@PACKAGE_VERSION@\0" | ||
25 | VALUE "FileVersion", "@PACKAGE_VERSION@\0" | ||
26 | VALUE "FileDescription", "GNU libmicrohttpd dll for Windows (VC build)\0" | ||
27 | VALUE "InternalName", "libmicrohttpd\0" | ||
28 | #if defined(_DEBUG) | ||
29 | VALUE "OriginalFilename", "libmicrohttpd_d.dll\0" | ||
30 | #else | ||
31 | VALUE "OriginalFilename", "libmicrohttpd.dll\0" | ||
32 | #endif | ||
33 | VALUE "CompanyName", "Free Software Foundation\0" | ||
34 | VALUE "LegalCopyright", "Copyright (C) 2007-2015 Christian Grothoff and project contributors\0" | ||
35 | VALUE "Comments", "http://www.gnu.org/software/libmicrohttpd/\0" | ||
36 | END | ||
37 | END | ||
38 | BLOCK "VarFileInfo" | ||
39 | BEGIN | ||
40 | VALUE "Translation", 0x0409, 0 /* US English, ASCII */ | ||
41 | END | ||
42 | END | ||