Léo Terziman
|
2071b4fb2f
|
Merge commit 'ca7542cf5d11ccde33e18365889343088bad9582' into contrib
Conflicts:
CMakeLists.txt
contrib/zlib/CMakeLists.txt
contrib/zlib/zconf.h.included
|
2014-01-17 11:30:33 +01:00 |
|
Léo Terziman
|
e4867646ab
|
Small corrections for the upgrading of zlib
|
2014-01-17 11:25:22 +01:00 |
Alexander Gessler
|
639afc6f01
|
Apply patch from #168. Revert contrib/zlib/CMakeLists.txt hack from 561f3bc6ea, but leave all Zlib install stuff commented.
|
2013-10-29 00:52:47 +01:00 |
|
Alexander Gessler
|
561f3bc6ea
|
Update CMakeLists.txt for zlib to build on MSVC again, closes #170.
|
2013-10-27 18:19:08 +01:00 |
Kim Kulling
|
e88fcb27bf
|
update: update zlib to version 1.2.8 ( see https://github.com/assimp/assimp/issues/134 )
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
|
2013-10-14 19:27:40 +02:00 |
aramis_acg
|
c05acabea9
|
- update cmake build environment, now includes targets to build debian packages for Assimp.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@997 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
|
2011-05-09 19:34:21 +00:00 |