diff --git a/Makefile.am b/Makefile.am
index 37b0875e..d80d0349 100644
--- 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
index 01042a33..21970cbc 100644
--- a/w32/VS2013/hellobrowser.vcxproj
+++ b/w32/VS2013/hellobrowser.vcxproj
@@ -35,14 +35,7 @@
x64
-
-
-
-
-
- {9cfb0342-a9e7-483e-bee5-a1de22584c5a}
-
-
+
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}
Win32Proj
@@ -84,90 +77,14 @@
-
-
- $(MhdSrc)include;$(SolutionDir);$(IncludePath)
-
-
- $(SolutionDir)$(ProjectName)\$(Configuration)\
- $(SolutionDir)Output\
-
-
- $(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\
- $(SolutionDir)Output\$(Platform)\
-
-
- true
-
-
- false
-
-
- $(ProjectName)_d
-
-
- $(ProjectName)-dll_d
-
-
- $(ProjectName)
-
-
- $(ProjectName)-dll
-
+
+
+
-
- NotUsing
- Level3
- WIN32;_CONSOLE;_LIB;%(PreprocessorDefinitions)
-
-
- Console
- true
-
+
+
-
-
- Disabled
- _DEBUG;%(PreprocessorDefinitions)
-
-
-
-
-
- MaxSpeed
- true
- true
- NDEBUG;%(PreprocessorDefinitions)
-
-
- true
- true
-
-
-
-
-
- MultiThreadedDebug
-
-
-
-
-
- MultiThreadedDebugDLL
-
-
-
-
-
- MultiThreaded
-
-
-
-
- MultiThreadedDLL
-
-
diff --git a/w32/VS2013/hellobrowser.vcxproj.filters b/w32/VS2013/hellobrowser.vcxproj.filters
index fd1e1f8b..ef5a1fdf 100644
--- a/w32/VS2013/hellobrowser.vcxproj.filters
+++ b/w32/VS2013/hellobrowser.vcxproj.filters
@@ -1,22 +1,5 @@
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hh;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
-
-
- Source Files
-
-
+
+
\ No newline at end of file
diff --git a/w32/VS2013/libmicrohttpd.vcxproj b/w32/VS2013/libmicrohttpd.vcxproj
index 0f72a3d5..fe94a58e 100644
--- a/w32/VS2013/libmicrohttpd.vcxproj
+++ b/w32/VS2013/libmicrohttpd.vcxproj
@@ -135,150 +135,13 @@
-
-
- 0
- 1
-
-
- $(MhdSrc)include;$(SolutionDir);$(IncludePath)
- ResourceCompile
-
-
- $(SolutionDir)$(ProjectName)\$(Configuration)\
- $(SolutionDir)Output\
-
-
- $(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\
- $(SolutionDir)Output\$(Platform)\
-
-
- $(ProjectName)_d
- $(ProjectName)
-
-
- $(ProjectName)-dll_d
- $(ProjectName)-dll
-
+
+
+
-
- NotUsing
- Level3
- Disabled
- WIN32;BUILDING_MHD_LIB;_UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
- 4996
- 4013
- $(IntDir)$(TargetName).pdb
-
-
- WINDOWS
- true
-
-
- Copy headers to output
- xcopy /F /I /Y "$(MhdSrc)include\microhttpd.h" "$(OutputPath)"
- $(OutputPath)microhttpd.h;%(Outputs)
- $(MhdSrc)include\microhttpd.h
-
-
-
-
- _WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
-
-
- 6.00
- /SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions)
-
-
- 6.00
- /SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions)
-
-
-
-
- _WIN32_WINNT=0x0501;%(PreprocessorDefinitions)
-
-
- 5.01
- /SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)
-
-
- 5.01
- /SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)
-
-
-
-
- _WIN32_WINNT=0x0502;%(PreprocessorDefinitions)
-
-
- 5.02
- /SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)
-
-
- 5.02
- /SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)
-
-
-
-
- _LIB;MHD_W32LIB;%(PreprocessorDefinitions)
-
-
- Ws2_32.lib
-
-
- xcopy /F /I /Y "$(IntermediateOutputPath)$(TargetName).pdb" "$(OutputPath)"
- Copy .pdb to output directory
-
-
-
-
- _USRDLL;MHD_W32DLL;%(PreprocessorDefinitions)
-
-
- Ws2_32.lib;%(AdditionalDependencies)
-
-
-
-
- Disabled
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
-
-
-
-
- Full
- true
- true
- AnySuitable
- Speed
- true
-
-
- true
- true
- true
-
-
- NDEBUG;%(PreprocessorDefinitions)
-
-
-
-
- MultiThreadedDebug
- MultiThreaded
-
-
-
-
- MultiThreadedDebugDLL
- MultiThreadedDLL
-
+
+
+
diff --git a/w32/VS2013/libmicrohttpd.vcxproj.filters b/w32/VS2013/libmicrohttpd.vcxproj.filters
index fd5796c5..63f58bfb 100644
--- a/w32/VS2013/libmicrohttpd.vcxproj.filters
+++ b/w32/VS2013/libmicrohttpd.vcxproj.filters
@@ -1,129 +1,5 @@
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hh;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
- {af799bf7-9787-4134-8e56-9e5aae50c7e3}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {df5ad836-e372-437b-a0e3-299d3675d6b4}
- in
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files\platform_interface
-
-
- Source Files
-
-
- Source Files
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Source Files
-
-
- Header Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
-
-
- Resource Files
-
-
-
-
- Template Files
-
-
+
+
\ No newline at end of file
diff --git a/w32/VS2013/MHD_config.h b/w32/common/MHD_config.h
similarity index 100%
rename from w32/VS2013/MHD_config.h
rename to w32/common/MHD_config.h
diff --git a/w32/common/common-build-settings.vcxproj b/w32/common/common-build-settings.vcxproj
new file mode 100644
index 00000000..280fd69a
--- /dev/null
+++ b/w32/common/common-build-settings.vcxproj
@@ -0,0 +1,99 @@
+
+
+
+
+ 0
+ 1
+
+
+ $(SolutionDir);$(MhdW32Common);$(MhdSrc)include;$(IncludePath)
+
+
+ $(SolutionDir)$(ProjectName)\$(Configuration)\
+ $(SolutionDir)Output\
+
+
+ $(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\
+ $(SolutionDir)Output\$(Platform)\
+
+
+ true
+
+
+ false
+
+
+
+ NotUsing
+ Level3
+ WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ 4996
+ 4013
+ $(IntDir)$(TargetName).pdb
+ ProgramDatabase
+
+
+ true
+
+
+
+
+ _WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
+
+
+ 6.00
+
+
+ 6.00
+
+
+
+
+ _WIN32_WINNT=0x0501;%(PreprocessorDefinitions)
+
+
+ 5.01
+
+
+ 5.01
+
+
+
+
+ _WIN32_WINNT=0x0502;%(PreprocessorDefinitions)
+
+
+ 5.02
+
+
+ 5.02
+
+
+
+
+ Disabled
+ true
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+
+
+
+
+ Full
+ true
+ true
+ AnySuitable
+ Speed
+ true
+
+
+ true
+ true
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+
diff --git a/w32/common/hellobrowser-build-settings.vcxproj b/w32/common/hellobrowser-build-settings.vcxproj
new file mode 100644
index 00000000..45e7ed7a
--- /dev/null
+++ b/w32/common/hellobrowser-build-settings.vcxproj
@@ -0,0 +1,32 @@
+
+
+
+ $(ProjectName)_d
+
+
+ $(ProjectName)-dll_d
+
+
+ $(ProjectName)
+
+
+ $(ProjectName)-dll
+
+
+
+ _CONSOLE;%(PreprocessorDefinitions)
+
+
+ Console
+
+
+
+
+
+ MultiThreadedDebug
+ MultiThreadedDebugDLL
+ MultiThreaded
+ MultiThreadedDLL
+
+
+
diff --git a/w32/common/hellobrowser-files.vcxproj b/w32/common/hellobrowser-files.vcxproj
new file mode 100644
index 00000000..f7caefb6
--- /dev/null
+++ b/w32/common/hellobrowser-files.vcxproj
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+ {9cfb0342-a9e7-483e-bee5-a1de22584c5a}
+
+
+
diff --git a/w32/common/hellobrowser-filters.vcxproj b/w32/common/hellobrowser-filters.vcxproj
new file mode 100644
index 00000000..c985906e
--- /dev/null
+++ b/w32/common/hellobrowser-filters.vcxproj
@@ -0,0 +1,22 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Source Files
+
+
+
diff --git a/w32/common/libmicrohttpd-build-settings.vcxproj b/w32/common/libmicrohttpd-build-settings.vcxproj
new file mode 100644
index 00000000..97d84a87
--- /dev/null
+++ b/w32/common/libmicrohttpd-build-settings.vcxproj
@@ -0,0 +1,55 @@
+
+
+
+ ResourceCompile
+
+
+ $(ProjectName)_d
+ $(ProjectName)
+
+
+ $(ProjectName)-dll_d
+ $(ProjectName)-dll
+
+
+
+ BUILDING_MHD_LIB;%(PreprocessorDefinitions)
+
+
+ WINDOWS
+
+
+ Windows
+
+
+ Copy headers to output
+ xcopy /F /I /Y "$(MhdSrc)include\microhttpd.h" "$(OutputPath)"
+ $(OutputPath)microhttpd.h;%(Outputs)
+ $(MhdSrc)include\microhttpd.h
+
+
+
+
+ _LIB;MHD_W32LIB;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+ MultiThreaded
+
+
+ Ws2_32.lib
+
+
+ xcopy /F /I /Y "$(IntermediateOutputPath)$(TargetName).pdb" "$(OutputPath)"
+ Copy .pdb to output directory
+
+
+
+
+ _USRDLL;MHD_W32DLL;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+ MultiThreadedDLL
+
+
+ Ws2_32.lib;%(AdditionalDependencies)
+
+
+
diff --git a/w32/common/libmicrohttpd-files.vcxproj b/w32/common/libmicrohttpd-files.vcxproj
index c51c53d1..20f1913a 100644
--- a/w32/common/libmicrohttpd-files.vcxproj
+++ b/w32/common/libmicrohttpd-files.vcxproj
@@ -32,7 +32,7 @@
-
+
diff --git a/w32/common/libmicrohttpd-filters.vcxproj b/w32/common/libmicrohttpd-filters.vcxproj
new file mode 100644
index 00000000..5c54751b
--- /dev/null
+++ b/w32/common/libmicrohttpd-filters.vcxproj
@@ -0,0 +1,129 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+ {af799bf7-9787-4134-8e56-9e5aae50c7e3}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {df5ad836-e372-437b-a0e3-299d3675d6b4}
+ in
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files\platform_interface
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Source Files
+
+
+ Header Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Resource Files
+
+
+
+
+ Template Files
+
+
+