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

108 Commits (12ed07a9399bbddd11bc101cacd7abbfb8bdb26b)

Author SHA1 Message Date
Håvard Mathisen 367c9980b2 Add Boost 1.59 2015-09-20 17:15:01 +02:00
abma d49e47c25c fix #431 2015-09-02 10:10:30 +02:00
abma fff2c4141e fix #634 2015-09-02 09:56:58 +02:00
Kim Kulling a78e3708d2 CMake build: fix debug postfix, will now be d only for debug builds. 2015-08-08 17:30:15 +02:00
Kim Kulling 99e7b221be CMake build: fix typo in docu.! 2015-08-08 17:24:06 +02:00
Russ Taylor 9474bbc8e9 Checks for DirectX. If it is not found, does not pull in the assimp_view project that needs it. 2015-07-04 16:08:26 -04:00
Richard 1d96486437 Refactored: Reformat CMake files to conform to editor config 2015-06-28 15:50:57 -06:00
Kim Kulling 6249a1c06f CMake: add comment for openddl-parser configuration. 2015-06-23 21:28:13 +02:00
Peter LaValle a00101cc02 changes to allow embedding 
changes several usages of CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR which allow embedding the assimp build in a larger CMake project

... as an alternative to dependency-hell
 2015-05-31 11:57:33 +01:00
Kim Kulling ab95b1a3c1 Replace tabs with whitespaces in CMake-file. 2015-05-30 18:13:08 +02:00
Jared Duke ef306d5666 Fix issue with CMAKE_CXX_FLAGS initialization 
Append the necessary flags to CMAKE_CXX_FLAGS, rather than replacing
the previous values. It's critical that that flags are preserved to
ensure proper and consistent compilation.
 2015-05-23 13:46:35 -07:00
U-ORADEV\albihern 7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
Ser Lev Arris cdeb95611d double definition, should better open my eyes... 2015-04-12 18:16:49 +02:00
Ser Lev Arris 7a6c00ca11 looks like cmake is per design not for building static executables, clang too. =%-| 2015-04-08 12:34:54 +02:00
arris69 297e1d2117 it's a difference if it's set to OFF or it's undefined... 2015-04-07 16:07:29 +02:00
Ser Lev Arris fb7661c430 add static flag for exe build if no shared build is requested 2015-04-07 08:20:27 +02:00
Kim Kulling 12efa14777 add openddl_parser directly to assimp. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 11:37:58 +01:00
Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ParsingUtils.h
 2015-03-17 14:26:39 +01:00
ulf b71ded1ad0 - manually merged C4D importer code from acgessler branch 
- manually merged IFC bugfixes and improvements from schrompf branch
 2015-02-23 14:23:28 +01:00
OgreTransporter 4e8f7fb802 Fix Visual Studio prefixes 2015-02-08 12:26:29 +01:00
Kim Kulling 065ad7173a fix build: no c++11 support 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 18:26:57 +01:00
Kim Kulling 20b3ce6a40 replace opengexparser by using openddl-parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 12:47:53 +01:00
Kim Kulling 063b2733fc Merge branch 'master' into opengex_support 2015-01-31 11:09:20 +01:00
Kim Kulling 1ee4c06e4b add openddl-parser to contrib. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 11:07:48 +01:00
Ricardo Ortiz a94e668486 Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX 
to have a consistent library name accross platforms.
 2015-01-23 14:19:29 -05:00
Kim Kulling af48644e56 fix build. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-03 01:09:33 +01:00
Kim Kulling df4db6e6e2 using cmake 3.0 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-02 20:34:37 +01:00
Kim Kulling 6820f1a5c9 workaround for compiler bug with mingw ( too many sections ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-02 15:34:23 +01:00
Kim Kulling 797c89c896 fix check for minimum version of cmake. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-02 15:33:47 +01:00
Kim Kulling 69dbf3713c fix typo 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-02 12:38:06 +01:00
Kim Kulling 7694561121 remove dead code from main CMakeLists.txt. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-12-16 22:34:24 +01:00
xantares 5c6921e2ea remove useless ASSIMP_BUILD_STATIC_LIB option 
BUILD_SHARED_LIBS must be used instead
 2014-11-27 08:58:29 +01:00
Timothy Gu 060f3c33d9 CMakeList: Support setting Libs.private 2014-10-14 22:28:14 -07:00
Filip Wasil 7224476ee1 Android JNI asset extraction support (API 9+) 
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
 2014-10-07 16:33:43 +02:00
OgreTransporter 9b3a88b2a5 New boost versions 2014-09-27 21:04:57 +02:00
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