Add conditional define to allow users to compile against their own zlib's.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@784 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/BlenderLoader.cpp

@@ -57,8 +57,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // zlib is needed for compressed blend files 
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_BLEND
+#	ifdef ASSIMP_BUILD_NO_OWN_ZLIB
+#		include <zlib.h>
+#	else
 #		include "../contrib/zlib/zlib.h"
 #	endif
+#endif
 
 using namespace Assimp;
 using namespace Assimp::Blender;

code/Q3BSPFileImporter.cpp

@@ -45,7 +45,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Q3BSPZipArchive.h"
 #include "Q3BSPFileParser.h"
 #include "Q3BSPFileData.h"
+
+#	ifdef ASSIMP_BUILD_NO_OWN_ZLIB
+#		include <zlib.h>
+#	else
 #		include "../contrib/zlib/zlib.h"
+#	endif
+
+
 #include "../include/aiTypes.h"
 #include "../include/aiMesh.h"
 #include <vector>

code/XFileParser.cpp

@@ -53,7 +53,11 @@ using namespace Assimp::XFile;
 
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_X
 
+#	ifdef ASSIMP_BUILD_NO_OWN_ZLIB
+#		include <zlib.h>
+#	else
 #		include "../contrib/zlib/zlib.h"
+#	endif
 
 // Magic identifier for MSZIP compressed data
 #define MSZIP_MAGIC 0x4B43

contrib/unzip/unzip.c

@@ -38,7 +38,6 @@ woven in by Terry Thorsen 1/2003.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../contrib/zlib/zlib.h"
 #include "./unzip.h"
 
 #ifdef STDC

contrib/unzip/unzip.h

@@ -50,7 +50,11 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "../../contrib/zlib/zlib.h"
+#	ifdef ASSIMP_BUILD_NO_OWN_ZLIB
+#		include <zlib.h>
+#	else
+#		include "../zlib/zlib.h"
+#	endif
 #endif
 
 #ifndef _ZLIBIOAPI_H