v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,220 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

73 Commits (b359deb7fdc348b2d8fd56f3e7e5d6c3d3156ed4)

Author SHA1 Message Date
abma d795491c48 fix unittests on linux / enable on travis-ci 2014-08-18 00:34:45 +02:00
abma aafc8d5f3f CMake: changed cached bools into "option" 2014-08-17 23:10:06 +02:00
Filip Wasil 139790f963 Assimp can now be built as a subproject in CMake based projects 
Signed-off-by: Filip Wasil <filip.wasil@gmail.com>
 2014-06-17 12:05:23 +02:00
Kim Kulling 01057f6ef0 bugfix: assimp now deals with boost 1.55. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-06-13 17:33:58 +02:00
Kim Kulling e09d88fa59 bugfix: fix cmake static linkage option. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-06-04 21:08:19 +02:00
Alexander Gessler 8b1a6ba920 Bump version number to 3.1 2014-06-02 01:45:23 +02:00
Léo Terziman 311f5b47ca Fixed bug during compilation with mingw & improved git revision support for automatic up to date revision number. 2014-05-19 14:36:24 +02:00
Kim Kulling 84491f22e2 update: enable tests as default because so it is much easier to run the unit tests after each bugfix. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-05-04 15:20:26 +02:00
Léo Terziman 2047cf6764 Merge remote-tracking branch 'official/master' into contrib 2014-04-28 09:11:40 +02:00
xantares d4f25c0096 Configure assimp-config.cmake.in after Boost is discovered as it requires the Boost version vars 2014-04-23 14:12:10 +02:00
YoheiKakiuchi bd1d33e8e8 fix typo, BUILD_SHARED_LIBS 2014-04-23 19:14:38 +09:00
Léo Terziman 7c3a039349 Merge remote-tracking branch 'official/master' into contrib 
Conflicts:
	include/assimp/matrix4x4.inl
	include/assimp/vector2.h
	include/assimp/vector3.h
 2014-04-22 14:32:59 +02:00
xantares 0e62405406 use standard BUILD_SHARED_LIB option. Install dll to <prefix>/bin (mingw) 2014-04-21 21:36:33 +02: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 630dd259f2 bugfix: 
- fix typo in cmake file.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-01-29 20:29:13 +01:00
Léo Terziman ca2314baa8 Fixed UTF8 encoding of CMakeFiles.txt 2014-01-17 12:21:37 +01:00
Léo Terziman 8bbe14c052 Merge commit '44773b8f9e47d9fe7e80946a1a9eb3d764fc8af2' into contrib 2014-01-17 11:52:08 +01:00
Léo Terziman cafa3d5811 Merge commit '89fbda0957ddc842d27a3a610c10bf2fe840a64f' into contrib 2014-01-17 11:38:16 +01:00
Léo Terziman ff5df971cb Fixing compiler flags for mingw 2014-01-17 11:33:20 +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 647eab6ae9 Improving CMake to build the static version of assimp with the static version of zlib 2014-01-17 11:25:39 +01:00
Léo Terziman e4867646ab Small corrections for the upgrading of zlib 2014-01-17 11:25:22 +01:00
Hauke Rehfeld 268a07b950 Merge https://github.com/hrehfeld/assimp 2013-11-26 20:39:05 +01:00
Hauke Rehfeld 68b897e353 fix: only add uninstall target if not previously defined 2013-11-26 19:43:17 +01:00
Marcel Metz 93fd1133ff Fixed mingw cross compiler issues. 2013-11-20 14:40:20 +01:00
Kim Kulling 89fbda0957 bugfix : fix Issue #176 cmake variables are now using quotes. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2013-11-09 21:17:12 +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
acgessler 56c4ee5525 Turn ASSIMP_BUILD_BOOST_WORKAROUND on by default, fixes #144 2013-10-06 22:30:19 +02:00
Alexander Gessler b786d6e375 - CMake: enable multicore compilation with msvc. 2013-04-21 15:03:16 +02:00
Alexander Gessler 4b748c2442 - CMake: use precompiled headers when compiling for msvc. This makes compilation about 40% faster. 2013-04-20 23:15:59 +02:00
Kim 18feb628c1 update : add new boost versions to cmake-lookup. 
Signed-off-by: Kim <Kulling>
 2013-03-28 20:24:58 +01:00
rdiankov 241c35abb2 removed ASSIMP_LIBRARY_SUFFIX 2013-03-18 21:11:49 +09:00
rdiankov 16744d78d7 fixed the broken cmake config files (assimp-cmake), adding version suffix libraries 2013-02-26 14:02:35 +09:00
Alexander Gessler bae9db2f03 Merge branch 'master' of git://github.com/assimp/assimp 2012-12-21 16:24:05 +01:00
ulfjorensen 81aef90f4a - manually pulled the three smaller change requests from Github. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1331 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-11-05 09:13:09 +00:00
Alexander Gessler 776d8e339b Merge branch 'master' of https://github.com/assimp/assimp 2012-07-24 03:30:47 +02:00
aramis_acg aaf0be0bbf - CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:56:15 +00:00
aramis_acg f849f6d9bd - merge 3.0 up to r1281 in trunk 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1283 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-11 12:53:04 +00:00
acgessler 5391ef9d6a - CMake: enable -Wall when building with gcc 2012-07-08 03:28:36 +02:00
kimmi eb3fd360f4 - Bugfix : Fix invalid variable ASSIMP_LIBRARY_DIRS. 
- Update : Introduce a subversion-revision variable for the right patch version.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1260 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-18 19:33:17 +00:00
kimmi 526150a8e3 Update: Debian-related cmake changes ( I changed the revision to 1256 instead of 1251 ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1256 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-11 11:49:08 +00:00
kimmi 97995e41f4 Debian-specific adapting cmake. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1255 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-05 19:30:45 +00:00
aramis_acg 5aeed46a25 # CMake, samples and tools can now be switched on/off independently. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1227 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-21 02:19:18 +00:00
klickverbot 3b0d2cbdb3 Enable simple OpenGL sample under Linux. 
Thanks to Marcel Metz for the patch.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1206 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-19 18:40:48 +00:00
jonathanklein 62b2ca3c1b Support for boost 1.49 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1188 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-03 15:18:43 +00:00
jonathanklein eebba5348d - Added Debug Postfix 
- added Viewer Installer

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1172 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-18 10:55:47 +00:00
kimmi 007dae433f Update : Boost lookup uses now additional versions ( thanks to Jonathan from zfx ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1123 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-25 18:33:46 +00:00
mmathias01 2c0b36bc45 Update CMake environment to accept BUILD_STATIC_LIB option to allow building of static library for platforms that require it (such as iOS). Sorry if I overstepped any bounds here; feel free to revert if required. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1088 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-24 10:59:09 +00:00
kimmi e8d8b23d52 Update : Add an architecture var to cmake. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1082 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-28 09:04:49 +00:00