Merge branch '10.5' into 'master'10.5

10.5

See merge request opensource-tracking/FreeFileSync!2

1 files changed, 4 insertions, 3 deletions

diff --git a/wx+/zlib_wrap.cpp b/wx+/zlib_wrap.cpp
index cb6e3083..fbbe2f09 100755
--- a/wx+/zlib_wrap.cpp
+++ b/wx+/zlib_wrap.cpp
@@ -5,9 +5,10 @@
 // *****************************************************************************
 
 #include "zlib_wrap.h"
-//include the SAME zlib version that wxWidgets is linking against!
-    //#include <wx/../../../../../Source/src/zlib/zlib.h> //wxWidgets compiled with: --with-zlib=builtin
-    #include <zlib.h> //use same library as used by Curl (zlib is required for HTTP)
+//Windows:     use the SAME zlib version that wxWidgets is linking against! //C:\Data\Projects\wxWidgets\Source\src\zlib\zlib.h
+//Linux/macOS: use zlib system header for both wxWidgets and Curl (zlib is required for HTTP)
+//             => don't compile wxWidgets with: --with-zlib=builtin
+#include <zlib.h>
 
 using namespace zen;