Needed some variation; got bored of seeing the compilation errors for this

[wxWidgets.git] / src / common / zstream.cpp

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 1ae27ad74c95cb78f00a19d88b6c2deed2e56391..8ccb8710db3fe5e622d065a4742c6609a0fcf3d5 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -29,8 +29,9 @@
 
 // When using configure, the path must be "zlib.h" I don't know
 // what other ports (wxMac, wxMotif without configure) need here.
-
-#ifdef __WXMSW__
+// 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"