Added code to handle SQLSERVER, ACCESS, and MSDE allowing spaces in table names and...

[wxWidgets.git] / src / common / unzip.c

diff --git a/src/common/unzip.c b/src/common/unzip.c
index dd8494835de4dc19bde60c35b684d31ffb48773c..7b1369e5aa36cd1cc07c83554c7a6fae9a8239b0 100644 (file)
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -14,14 +14,26 @@ $Id$
 
 
 
-#include "wx/defs.h"
+#include "wx/setup.h"
 
 #if wxUSE_ZLIB && wxUSE_ZIPSTREAM
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "zlib.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"
+#elif defined(__WXMAC__) && defined(__UNIX__)
+   #include <Kernel/net/zlib.h>
+#else
+   #include "zlib.h"
+#endif
+
 
 /* Not the right solution (paths in makefiles) but... */
 #ifdef __BORLANDC__