diff options
| author | B Stack <bgstack15@gmail.com> | 2018-10-16 17:33:51 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-10-16 17:33:51 -0400 |
| commit | 878a41d3be13da2a654df74f2a35ea8b295c8a13 (patch) | |
| tree | 89b2a018482c164bdd8ecac5c76b19a08f420dec /wx+/zlib_wrap.cpp | |
| parent | Merge branch '10.4' into 'master' (diff) | |
| download | FreeFileSync-878a41d3be13da2a654df74f2a35ea8b295c8a13.tar.gz FreeFileSync-878a41d3be13da2a654df74f2a35ea8b295c8a13.tar.bz2 FreeFileSync-878a41d3be13da2a654df74f2a35ea8b295c8a13.zip | |
10.5
Diffstat (limited to 'wx+/zlib_wrap.cpp')
| -rwxr-xr-x | wx+/zlib_wrap.cpp | 7 |
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; |