VC builds: fix asserts and release builds

4 files changed, 9 insertions, 0 deletions

diff --git a/w32/common/MHD_config.h b/w32/common/MHD_config.h
index 191a6cf9..89b750a3 100644
--- a/w32/common/MHD_config.h
+++ b/w32/common/MHD_config.h
@@ -75,6 +75,9 @@
 /* Define to 1 if you have the usable `calloc' function. */
 #define HAVE_CALLOC 1
 
+/* Define if you have usable assert() and assert.h */
+#define HAVE_ASSERT 1
+
 #if _MSC_VER >= 1900 /* snprintf() supported natively since VS2015 */
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
diff --git a/w32/common/common-build-settings.vcxproj b/w32/common/common-build-settings.vcxproj
index 362340c6..6643fe13 100644
--- a/w32/common/common-build-settings.vcxproj
+++ b/w32/common/common-build-settings.vcxproj
@@ -74,6 +74,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <SmallerTypeCheck>true</SmallerTypeCheck>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -87,6 +88,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/w32/common/libmicrohttpd-files.vcxproj b/w32/common/libmicrohttpd-files.vcxproj
index 6f1e03bc..3897a943 100644
--- a/w32/common/libmicrohttpd-files.vcxproj
+++ b/w32/common/libmicrohttpd-files.vcxproj
@@ -31,6 +31,7 @@
     <ClInclude Include="$(MhdSrc)microhttpd\internal.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\md5.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h" />
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_assert.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h" />
diff --git a/w32/common/libmicrohttpd-filters.vcxproj b/w32/common/libmicrohttpd-filters.vcxproj
index d0c47073..6d1d55ee 100644
--- a/w32/common/libmicrohttpd-filters.vcxproj
+++ b/w32/common/libmicrohttpd-filters.vcxproj
@@ -96,6 +96,9 @@
     <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_assert.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h">
       <Filter>Source Files</Filter>
     </ClInclude>