v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
pull/1/head
aramis_acg 2010-07-16 17:49:04 +00:00
parent e5aad11944
commit 3204cf2736
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/BlenderLoader.cpp
View File

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

9
code/Q3BSPFileImporter.cpp
View File

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

6
code/XFileParser.cpp
View File

@ -53,7 +53,11 @@ using namespace Assimp::XFile;
#ifndef ASSIMP_BUILD_NO_COMPRESSED_X #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 // Magic identifier for MSZIP compressed data
#define MSZIP_MAGIC 0x4B43 #define MSZIP_MAGIC 0x4B43

1
contrib/unzip/unzip.c
View File

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

6
contrib/unzip/unzip.h
View File

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