d898ecc80c
Fix another typo.
2021-01-06 18:59:13 +01:00
2ad4218d25
Merge branch 'master' into master
2021-01-06 18:54:57 +01:00
5222ab989f
Fix a typo
2021-01-06 18:51:59 +01:00
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
e1052f421b
Update OpenDDLParser.cpp
2021-01-06 16:52:28 +03:00
177304bb7c
Update o3dgcArithmeticCodec.cpp
2021-01-06 16:50:07 +03:00
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
c464d01778
Fix fopen64, ftello64, fseeko64 declarations on all platforms
2020-12-24 03:18:09 +01:00
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
c65f2cb3fb
Remove extra semicolon while GCC being pedantic.
2020-12-13 00:12:44 +05:30
8d8ba521e2
Check _MSC_VER for MSVC specific pragma directives.
...
This fixes build issues when compiled with compiles like Clang or GCC.
2020-12-02 02:05:14 +05:30
3fd95aff4e
Merge branch 'master' into fix/3365
2020-10-27 17:43:28 +01:00
22ad7028f0
Delete CMakeLists.txt
2020-10-27 09:42:46 +01:00
4bba338d92
Update CMakeLists.txt
2020-10-27 09:23:20 +01:00
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
57e691e28e
openddl: latest greatest.
2020-10-25 10:34:43 +01:00
3b5212067c
Fix CMake config generation
...
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
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
Kim Kulling
ihsinme
Fabrice Fontaine
Jean-Louis
Biswapriyo Nath
Kim Kulling
Silvio Traversaro
Arthur (fuj1n) Uzulin
MeyerFabian
awr1
Hanif Bin Ariffin
kkulling
luca
Peter Seiderer
Andy Maloney
Aaron Franke