Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@784 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2010-07-16 17:49:04 +00:00
parent e5aad11944
commit 3204cf2736
5 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 "Q3BSPFileParser.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/aiMesh.h"
#include <vector>