]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/zstream.cpp
PCX handler now working for reading (8bit and 24bit images).
[wxWidgets.git] / src / common / zstream.cpp
index 1424f3b22bf2b18b638ebecb9c1fc092f04ab05f..8ccb8710db3fe5e622d065a4742c6609a0fcf3d5 100644 (file)
   #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-
 #if wxUSE_ZLIB && wxUSE_STREAMS
 
 #include "wx/zstream.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"
-#include "zlib.h"
+
+// When using configure, the path must be "zlib.h" I don't know
+// what other ports (wxMac, wxMotif without configure) need here.
+// If we are building with configure (defines __WX_SETUP_H__), 
+// we trust the zlib path is given as a -I option.
+#if defined(__WXMSW__) && !defined(__WX_SETUP_H__)
+   #include "..\zlib\zlib.h"
+#else
+   #include "zlib.h"
+#endif
 
 #define ZSTREAM_BUFFER_SIZE 1024