Commit Graph

35 Commits

Author SHA1 Message Date
luca
4488e3e745 build on Linux with gcc and clang; warning as error only for 'assimp' target 2020-04-27 23:38:33 -07:00
Kim Kulling
d2499ac197 Update CMakeLists.txt
Linke irrXml static for apple
2020-04-10 12:52:54 +02:00
Kim Kulling
6f8d96b57e Merge branch 'master' into kimkulling_dev 2020-03-23 09:00:41 +01:00
Kim Kulling
92da00329f Update irrArray.h
fix init ordering.
2020-02-16 18:10:52 +01:00
Kim Kulling
d75f46280d Update irrString.h
fiix ordering of initializiation
2020-02-16 15:32:29 +01:00
Kim Kulling
4a3ecbea14 disable arning for irrXml. 2020-02-15 11:43:35 +01:00
Kim Kulling
783430667b fix initializer ordering for irrXml. 2020-01-17 20:21:53 +01:00
Kim Kulling
f51b9378b1 updating irrXml. 2020-01-17 19:26:58 +01:00
tanolino
82f926971b Update CXMLReaderImpl.h
Issues with German locale number converter expecting German numbers.

In Germany we have numbers like #,## instead of #.## . Thus a unit conversion in COLLADA of 0.01 (centimeter) turned out to be 0.00.
2019-11-01 17:01:52 +01:00
Kim Kulling
2be0eba1ab put one in comments because the file seems to be corrupt. 2019-09-14 19:32:47 +02:00
Rémi Verschelde
5fa750fda0 Fix code files encoding to make them all UTF-8 2019-05-22 10:19:32 +02:00
Kim Kulling
dbd0f06d32 Update CMakeLists.txt
Make IrrXml dynamic only on BSD
2019-04-08 20:21:20 +02:00
Kim Kulling
37357515fa Update irrXML.h
FIx export directive for linux.
2019-04-08 12:49:07 +02:00
Kim Kulling
525566b8b8 try to fix shared object issue. 2019-03-16 18:36:26 +01:00
Kim Kulling
a3fdb46f67 fix typo. 2019-03-16 17:02:38 +01:00
Kim Kulling
f4ec02a34b Fix install folders for cmake - os files. 2019-03-16 16:10:30 +01:00
Kim Kulling
e9b6a4895d Fix the build. 2019-03-16 15:32:47 +01:00
Kim Kulling
ba6a7383b2 closes https://github.com/assimp/assimp/issues/1650: build irrXml as shared lib. 2019-03-16 09:45:21 +01:00
kimkulling
f75bf6d99c MAke noexcept compiler-specific. 2018-09-21 16:25:27 +02:00
kimkulling
f818a909e5 Fix static-code-analysis findings. 2018-09-21 16:07:09 +02:00
BuildTools
66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Turo Lamminen
0cc25491a4 irrXML: Remove horrible hack 2017-12-24 15:38:42 +02:00
Jared Mulconry
94a6fc78f4 Addressed last remaining warning under MSVC caused by use of 'deprecated' fopen. 2017-09-15 18:27:59 +10:00
Lee Jeffery
d0d45d1d22 Fix linking issue with irrXML 2017-08-20 19:07:09 +01:00
Helio Chissini de Castro
4a0171bd82 - Apply mechanism to decide use for IrrXML external or internal
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.

Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists

Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00
Kim Kulling
524834c307 Fix line endings. 2015-08-08 18:02:37 +02:00
Wil Shipley
8b7fa48d27 - Merge in latest from assimp/assimp on GitHub (5c00aef7cd)
- Added at least some of the new files to my Xcode 6 project, as
well.
    - Built and tested with the DAE importer, seems to work fine.
2015-07-26 19:16:01 -07:00
abma
bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
Léo Terziman
bac6b34504 Removing null characters from xml parser input to avoid parsing failures 2014-01-17 11:48:42 +01:00
aramis_acg
4dbf539b44 - update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 03:38:30 +00:00
aramis_acg
17326515d4 Get rid of warnings on GCC4.4 with -wall
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@541 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-06 23:52:41 +00:00
aramis_acg
a9ece90b81 FIX: Scons workspace was missing a reference to contrib/ConvertUTF.
FIX: assimp_cmd doesn't anymore execute ConvertToLeftHanded if only -fuv or -fwo is specified.
FIX: Amd64-Build with vc8 - invalid integer promotion
FIX: Remove '_asm int 3' debug stuff from IrrXML. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@512 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-12-14 17:17:41 +00:00
ulfjorensen
98e53f976e - Bugfix: IrrXML loader ignores trailing whitespace on closing tags now
- Bugfix: Collada loader now filters bone vertex weights with weight zero - blame XSI collada export.
- Bugfix: Collada animation resolver now also considers IDs when searching for nodes by name

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@460 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-08-01 20:20:22 +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