Commit Graph

41 Commits (159fadebbf191729b291d8b06ff17dfe38bbcb69)

Author SHA1 Message Date
Kim Kulling 9334e07619
Update CMakeLists.txt 2021-01-16 16:14:49 +01:00
Kim Kulling 8ad2661e0c
Update CMakeLists.txt 2021-01-16 12:00:42 +01:00
Kim Kulling 6db343386b
remove install of zlibstatic 2021-01-15 16:46:15 +01:00
Kim Kulling d898ecc80c
Fix another typo. 2021-01-06 18:59:13 +01:00
Kim Kulling 5222ab989f
Fix a typo 2021-01-06 18:51:59 +01:00
Kim Kulling b23ecb4864
Update CMakeLists.txt
- Update minimum cmake version
- install for win32-platforms to avoid conflicts with targets for win32
2021-01-06 18:51:30 +01:00
Fabrice Fontaine bfe35fc06b contrib/zlib/CMakeLists.txt: don't install zlib
Don't install zlib static library to avoid potential conflicts with a
system-wide zlib package

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-12-27 15:27:41 +01:00
Silvio Traversaro 3b5212067c Fix CMake config generation
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
Kim Kulling ea26cba420
Merge branch 'master' into ps-devel-fix-contrib-zlib-static-compile-001 2020-05-09 11:10:33 +02:00
kkulling 4e16716924 Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting 2020-05-05 10:17:52 +02:00
Peter Seiderer 74c8d09bd8 contrib/zlib: disable dynamic library building
Fixes compile failure for static only toolchains (and assimp
links against the static one).
2020-04-13 14:55:57 +02:00
Aaron Franke 1529f9518f
Make file formatting comply with POSIX and Unix standards
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
Kim Kulling b072614fad disable warnings for zib. 2020-02-15 11:40:26 +01:00
Rémi Verschelde 5fa750fda0 Fix code files encoding to make them all UTF-8 2019-05-22 10:19:32 +02:00
kimkulling 79f62b0174 closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 policy even for zlib in the assimp build. 2019-04-08 14:24:33 +02:00
Marco Di Benedetto 59ea3b6c85 fixed android zlib compile error. 2018-02-09 16:02:27 +01:00
Kim Kulling 280c995191 closes https://github.com/assimp/assimp/issues/905: add missing contrib source from zlib. 2018-01-31 22:55:05 +01:00
Kim Kulling 6a9df80f68 closes https://github.com/assimp/assimp/issues/1655: add typedef for android NDK. 2017-12-28 14:52:41 +01:00
Kim Kulling 7db10022e9 closes https://github.com/assimp/assimp/issues/1513: fix assimp for cross compile for android 2017-11-15 21:26:25 +01:00
Jared Mulconry e7c112916b Removed unnecessary files from zlib contribution 2017-10-05 20:11:18 +11:00
Jared Mulconry bab6ca2085 Upgraded zlib to 1.2.11.1 from the develop branch. 2017-10-04 20:33:59 +11:00
Kim Kulling 54ac680400 fix merge conflict. 2016-01-06 22:19:07 +01:00
Kim Kulling 6bfdeb6a12 sprintf replacement: introduce au_snprintf to support snprintf for v2013
and earier ( closes https://github.com/assimp/assimp/issues/743 )
2016-01-06 15:35:25 +01:00
Kim Kulling 524834c307 Fix line endings. 2015-08-08 18:02:37 +02:00
Alexander Gessler 455d190fd0 CMakeLists: backwards compatibility with CMake < 3.0. 2015-01-31 20:51:36 +01:00
Gustav 7c17c5f46b Also install zlibstatic 2014-12-29 16:30:44 +01:00
Gustav e6988f62f6 Fixed cmake 3x cmp0048 warning 2014-12-29 16:18:17 +01:00
Léo Terziman 505a8d42aa Merge remote-tracking branch 'official/master' into contrib
Conflicts:
	contrib/zlib/CMakeLists.txt
2014-01-31 11:14:59 +01:00
Kim Kulling f99e307c4b bugfix:
- remove commented code in cmake build for zlib_static.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-01-29 21:07:21 +01:00
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 1867a4a3a3 bugfix: add missing zconf file for cmake.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 20:09:35 +02:00
Kim Kulling b96cd522fa bugfix : add cmakein file for zlib.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 20:06:16 +02: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
aramis_acg 1b87557fd1 update to zlib 1.2.5.
blenderloader now reads gzip compressed files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@737 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-26 00:21:07 +00:00
aramis_acg 4bbc03332b General
- Added format auto-detection to most loaders
  - Simplified BaseImporter::CanRead() with some utility methods
  - improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
  - added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
  - vc8/vc9: revision number is now written to DLL version header
  - mkutil: some batch scripts to simplify tagging & building of release versions
  - some API cleanup
  - fixing some doxygen markup (+now explicit use of @file <filename>)
  - Icon for assimp_view and assimp_cmd

3DS
  - Normal vectors are not anymore inverted in some cases
  - Improved pivot handling
  - Improved handling of x-flipped meshes

Collada
  - fixed a minor bug (visual_scene element)

LWS 
  - WIP implementation. No animations yet, some bugs and crashes.
  - Animation system remains disabled, WIP code
  - many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.

STL
  - fixing a log warning which appears for every model
  - added binary&ascii test spider, exported from truespace

MD3 
  - Cleaning up output tags for automatically joined player models.


IRR
  - Fixing coordinate system issues. 
  - Instance handling improved.
  - Some of the reported crashes not yet fixed.

PretransformVertices
  - Numerous performance improvements.
  - Added config option to preserve the hierarchy during the step.

RemoveRedundantMaterials
  - Added config option to specify a list of materials which are kept in every case.

UNREAL
  - Added support for the old unreal data format (*.a,*.d,*.uc)
  - tested only with exports from Milkshape
  - more Unreal stuff to come soon



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
aramis_acg 3d5eae6be5 Moved some defines into the core, away from the public stuff.
Fixed build error regarding zutil.c with vc9.
Updated VC9 project files (again ...)
Moved version getters to aiVersion.h.
Deleted redundant fast_atof.h from irrXML.
Added vc9 config for cppunit
Fixed a missing include when building against stlport

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@307 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-19 19:34:34 +00:00
aramis_acg d41f570dc0 Added support for compressed x files (all files from dx sdk, except car2.x, work, no further tests yet).
Added a working makefile for mingw, provides more configs now. Not perfect yet.
Added decompression part of zlib (inflate).
Moved IrrXML to ./contrib dir.
Moved some IRR/IRRmesh shared code.
FIXME: makefile for gnu/linux is untested yet.
Code cleanup.
Unified #ifndef ASSIMP_BUILD_nnn_IMPORTER directives.
OBJ loader supports map_bump, map_ka, map_ks, map_ns now.
Endianess conversion in the ply loader is correct now.
Changed IRR/IRRMESH coordinate system conversion. Not absolutely right now, but better than before.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-18 23:48:25 +00:00