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
2010-07-16 17:49:04 +00:00
parent e5aad11944
commit 3204cf2736
5 changed files with 23 additions and 5 deletions
--- a/code/XFileParser.cpp
+++ b/code/XFileParser.cpp
@@ -53,7 +53,11 @@ using namespace Assimp::XFile;

 #ifndef ASSIMP_BUILD_NO_COMPRESSED_X

-#include "../contrib/zlib/zlib.h"
+#	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