X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d71c52c4711c29132b62dd1c45838f0958767d39..594f0f5bf1355fb8d58f403d3ebacc1c1767c429:/src/common/unzip.c?ds=inline

diff --git a/src/common/unzip.c b/src/common/unzip.c
index 551b1c6b2d..02a37dc16c 100644
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -21,7 +21,19 @@ $Id$
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+/*
 #include "zlib.h"
+ normally, the compiler options should contain -I../zlib, but it is
+ apparently not the case for all MSW makefiles and so, unless we use
+ configure (which defines __WX_SETUP_H__) or it is explicitly overridden by
+ the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
+*/
+#if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
+   #include "../zlib/zlib.h"
+#else
+   #include "zlib.h"
+#endif
+
 
 /* Not the right solution (paths in makefiles) but... */
 #ifdef __BORLANDC__