23f144a7b7
pugixml: use pugixml in headeronly mode.
2020-10-05 18:44:59 +02:00
9303fb31f6
Enable export only for windows
2020-10-02 11:30:37 +02:00
9d296f3943
export pugixml symbold in assimp
2020-10-01 22:02:03 +02:00
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
c740f61f97
hunter integration: pugixml
2020-10-01 10:29:52 +02:00
484d305987
pugi: enable static linkage explicitely.
2020-09-29 20:33:39 +02:00
8f0888f7fc
diable hunter fr pugi.
2020-09-28 20:03:51 +02:00
a6b90c354b
fix pugi warnings
2020-09-27 20:38:09 +02:00
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
995ab805ff
Update utf8cpp to fix use of C++17 deprecated feature
2020-08-17 17:54:48 +10:00
c7a9ef30cc
Merge branch 'master' into fix-mingw-priumax
2020-07-24 11:14:15 +02:00
51e592123a
Fix two deletions.
2020-07-20 18:42:57 +02:00
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
77cf6e3433
Ensure that zip.h warning disable is pushed
2020-07-14 22:07:24 -05:00
700d8e6614
Fix MinGW builds (issues related to pragmas and format strings)
2020-07-14 21:19:07 -05:00
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
fb20e15163
start to migrate colladat and amf
2020-06-27 15:57:06 +02:00
f0f6612b81
disable warning for radjson.
2020-06-15 20:52:11 +02:00
d4ca91f408
Evaluated the following expressions to either values.
2020-05-28 19:20:54 -04:00
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
ea26cba420
Merge branch 'master' into ps-devel-fix-contrib-zlib-static-compile-001
2020-05-09 11:10:33 +02:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
4488e3e745
build on Linux with gcc and clang; warning as error only for 'assimp' target
2020-04-27 23:38:33 -07:00
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
d2499ac197
Update CMakeLists.txt
...
Linke irrXml static for apple
2020-04-10 12:52:54 +02:00
96c7c567e6
Merge branch 'master' into kimkulling_dev
2020-03-26 11:56:45 +01:00
046f50880f
{cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule
...
When libraries are included as submodules in large projects, having an option with a generic name like "BUILD_DOCS" is not very helpful. (e.g. one project I work on includes many libraries as submodules)
It can also clash with options from other libraries which can break things.
2020-03-23 12:35:32 -04:00
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
9f7d9becb2
fix the linux build.
2020-03-21 08:56:49 +01:00
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
ac3f08a4d8
fix 3rdparty warnings.
2020-03-20 09:49:36 +01:00
9aa5e3e04f
fix new vs2013 warnings.
2020-03-18 21:32:17 +01:00
976091a6f6
ix compiler warning for pragma statements.
2020-03-15 11:47:05 +01:00
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
bb3db0ebaf
closes https://github.com/assimp/assimp/issues/2954 : upgrade to latest greatest.
2020-03-09 10:51:26 +01:00
e8d2b84017
clean all warnings for vs-2019
2020-03-08 21:24:01 +01:00
edfaaed56f
Removed uneeded expression in else() and endif() constructs.
...
The following changes were tested against building with a master copy.
For a more detailed report, please read the followings below:
The flags that were checked were the ones checked by default + the following:
ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES
The list of compilable projects in Visual Studio were the following:
- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic
The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.
UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004 .
2020-02-23 07:09:35 -05:00
92da00329f
Update irrArray.h
...
fix init ordering.
2020-02-16 18:10:52 +01:00
d75f46280d
Update irrString.h
...
fiix ordering of initializiation
2020-02-16 15:32:29 +01:00
4a3ecbea14
disable arning for irrXml.
2020-02-15 11:43:35 +01:00
b072614fad
disable warnings for zib.
2020-02-15 11:40:26 +01:00
a905303764
IrrXml: replaced irrXml by pugixml.
2020-01-23 21:16:10 +01:00
d48b93cf34
Merge branch 'master' into pugi_xml
2020-01-18 08:28:19 +01:00
783430667b
fix initializer ordering for irrXml.
2020-01-17 20:21:53 +01:00
f51b9378b1
updating irrXml.
2020-01-17 19:26:58 +01:00
40d882af4f
fix irrreader leak.
2020-01-16 20:25:47 +01:00
f78446b14a
closes https://github.com/assimp/assimp/issues/2733 : update of zlip to fix gcc build for v9.2.0 32 bit
2019-11-19 20:30:40 +01:00
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
4b9cc1a484
Merge branch 'master' into fix-codacy-issues
2019-09-18 20:32:49 +02:00
3b608307c8
prefer prefix ++/-- operators for non-primitive types
2019-09-18 08:00:58 +02:00
Kim Kulling
Kim Kulling
Arthur (fuj1n) Uzulin
MeyerFabian
awr1
Hanif Bin Ariffin
kkulling
luca
Peter Seiderer
Andy Maloney
Aaron Franke
Marc-Antoine Lortie
tanolino
escherstair