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

275 Commits (d672ae21d03c4fbe5c9b441ec2ba25004f0c282c)

Author SHA1 Message Date
Mike Samsonov 873a358ce4 A crash in the aiMesh descructor 2019-09-05 11:44:02 +01:00
Kim Kulling 4d9b350184
Update CMakeLists.txt 
Remove optimization because irrxml sucks.
 2019-09-03 15:17:42 +02:00
Kim Kulling 071504991a
Update CMakeLists.txt 
Enable optimization
 2019-09-03 11:39:05 +02:00
Daniel Bernar afb24d7a1c
Fix #2618 
Added CXX flag -O3 for MinGW
 2019-08-27 19:33:12 +03:00
Kim Kulling 74685477e6
Update CMakeLists.txt 
Put it into the win32 for VS part.
 2019-08-19 17:22:51 +02:00
anandvsingh e5372fc385
Update CMakeLists.txt 2019-08-18 15:44:38 +02:00
RichardTea 0400e0bc7f Multi-Config generators should also set the debug suffix when enabled 
Issue #2599
 2019-08-16 11:10:30 +01:00
Pierre Anquez 337df20209
Update CMakeLists.txt 2019-07-25 17:12:16 +02:00
Pierre Anquez a879102309
Update CMakeLists.txt 2019-07-25 16:27:35 +02:00
Pierre Anquez 9dce8e40ba
Update CMakeLists.txt 2019-07-25 16:03:26 +02:00
Rahul Sheth d00f4f4b3a Build Hunter-compatible config file 2019-06-13 21:34:47 -07:00
Rahul Sheth dab8041bcd rewrite include paths for Hunter packages 2019-06-13 21:32:36 -07:00
Rahul Sheth a4587e8609 Use hunter to download dependencies if HUNTER_ENABLED is ON 2019-06-13 21:31:24 -07:00
Rahul Sheth 1db3e1e11f Allow CXX_STANDARD and other relevant compiler definitions to be set by Hunter user 2019-06-13 21:31:24 -07:00
Rahul Sheth dd9511aaef Add HunterGate URL/SHA1 2019-06-13 21:31:24 -07:00
Kim Kulling 2da3a38d60 Fix the compile pass, still unresolved symbols. 2019-06-10 23:26:00 +02:00
Jack Andersen d048bccad1 Export static libaries as CMake package 
When built with BUILD_SHARED_LIBS disabled, the exported CMake
targets are modified to reference the static library location.

This also fixes version detection for VS2017 and beyond within
the target import script.
 2019-05-24 22:06:50 -10:00
Kim Kulling 0898484d45 Inno: fix folder names + versions. 2019-05-11 11:02:28 +02:00
Kim Kulling e108b6f1d2
Merge branch 'master' into fix-mingw-debug-build 2019-05-01 17:04:45 +02:00
RichardTea 692927a8a1 Default CMAKE_DEBUG_POSTFIX to 'd' on multiconfig 
When the generator is multi config (eg MSVC, xcode) always set the debug postfix to 'd'
 2019-04-17 10:03:18 +01:00
RichardTea 836801d37e CMake updates for VS2015/cmake 3.12 onwards 
cmake 3.12 adds MSVC_TOOLSET_VERSION to define the version of MSVC toolchain in use
Use that if present instead of if-elseif chain
 2019-04-17 09:32:24 +01:00
Charlie Gettys 567a645c4f * Improve error message for new check on MinGW compiler version 2019-04-10 10:31:57 -04:00
Charlie Gettys 6a373d55c7 * Add notes on MinGW compiler version requirements 
* Add check on MinGW compiler version to force compliance.
* Closes #2315 ?
 2019-04-10 10:07:24 -04:00
RichardTea 2a3626577f
Merge pull request #2 from assimp/master 
Update to Assimp Master 0973f50
 2019-04-08 14:06:36 +01:00
Kim Kulling 010afeb1d8
Merge branch 'master' into issue_1650 2019-04-04 12:42:21 +02:00
Andy Maloney 6c26268035 {cmake} Explicitly turn off ASM686 and AMD64 cmake options when ASSIMP_BUILD_ZLIB is on 
The AMD64 option causes a build failure on MSVC (#1760) and the ASM builds seem to have problems:

   https://github.com/madler/zlib/issues/41#issuecomment-125848075

This change also prevents these from "polluting" the cmake options if assimp is being included as a submodule.
 2019-03-24 10:41:00 -04:00
Kim Kulling 64bcf56101
Merge branch 'master' into issue_1650 2019-03-16 16:13:52 +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
Kim Kulling 925ac6b372
Typo 
Fix a typo in a comment.
 2019-03-10 11:17:52 +01:00
RichardTea 7d7574f189
Merge branch 'master' into ETC_Inc 2019-03-05 12:07:10 +00:00
Andy Maloney 99c3697d12 Ensure our include directories get added in the correct order 
If you have assimp installed already and in the include path (e.g. I have it via homebrew), it can pick up the wrong headers.

This forces the include order so our local ones are found first when building assimp.
 2019-03-01 12:38:59 -05:00
Kim Kulling 0810b2d51b
Merge branch 'master' into ETC_Inc 2019-02-15 10:20:30 +01:00
kimkulling a06133ab52 Update copyrights. 2019-01-30 09:41:39 +01:00
Richard fe6b316695 Set MSVC projects to default to Unicode 
MBCS is deprecated and shouldn't be used in new projects
 2019-01-10 17:27:54 +00:00
Maxim Petrovsky b4c427912f added bitcode ios 2018-12-20 16:51:01 +02:00
Martin Jeřábek a916c7b1e3 ensure that GitVersion fits into 32 bits 2018-11-26 12:06:38 +01:00
Kim Kulling d1f7472242
Update CMakeLists.txt 2018-10-05 21:28:07 +02:00
Kim Kulling 3cf5fbb945
Update CMakeLists.txt 
Fix the switches.
 2018-10-05 20:45:41 +02:00
Kim Kulling f588568c53 closes https://github.com/assimp/assimp/issues/2067: introduce /bigobj compiler flag 2018-10-05 20:20:16 +02:00
Kim Kulling aab796bc1c
Merge branch 'master' into master 2018-10-02 01:13:13 +02:00
Minmin Gong 4bd57f7577 Add IGNORE_GIT_HASH. 2018-09-30 19:25:43 -07:00
dormon b43cf92337 Improved cmake configs for Windows and Linux. 
Now the configs follows the standard cmake-package code: see https://cmake.org/cmake/help/v3.12/manual/cmake-packages.7.html

Downstreamer no longer have to manually specify target_include_directories with ${ASSIMP_INCLUDE_DIRS}, target_link_libraries with ${ASSIMP_LIBRARY_DIRS} and so on.

Downstreamer can now use:
find_package(assimp CONFIG REQUIRED)
target_link_libraries(AWESOME_APP PUBLIC assimp::assimp)
and everything should work.

Added assimpTargets.cmake.in
Added assimpTargets-debug.cmake.in
Added assimpTargets-release.cmake.in
Modified CMakeLists.txt
Modified code/CMakeLists.txt - added ALIAS assimp::assimp

Tested on Ubuntu 18.04 and Windows 10
 2018-09-30 17:18:18 +02:00
Turo Lamminen 78fe96f8c4 Prepend our compiler flags instead of appending so overriding them works better 2018-09-18 11:08:01 +03:00
Turo Lamminen 6488bc6387 Disable strict aliasing optimizations 
The code is not clean w.r.t the strict aliasing rules.
In particular LWS importer breaks with GCC >= 6.0 if this is enabled.
 2018-09-18 11:08:01 +03:00
Kim Kulling a7306abcfe MDC-Loader: fix a possible nullptr access. 2018-08-31 19:29:17 +02:00
Kim Kulling 5a23810d82 Introduce header-only imagelib to make install of qt-viewer simpler. 2018-08-18 11:07:12 +02:00
Kim Kulling 063ae05310
Merge branch 'master' into 2075 2018-08-07 21:30:01 +02:00
Kim Kulling 11931b85fd closes https://github.com/assimp/assimp/issues/2075: Make inject of debug postfix an option, so you can swich it off. 2018-08-07 21:22:54 +02:00
Max Qian a77887c874 Use a more accurate way of checking if the build is 64 bit 2018-07-26 08:08:07 -07:00
Kim Kulling 797446aadf
Merge branch 'master' into build-minizip-2 2018-07-10 14:34:46 +02:00