v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into updatedJson

pull/5501/head
Kim Kulling 2024-04-07 19:17:22 +01:00 committed by GitHub
parent 262a0a3d9a 1f920ee1fe
commit 3ed5adfca6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -49,8 +49,8 @@ option(ASSIMP_HUNTER_ENABLED "Enable Hunter package manager support" OFF)
IF(ASSIMP_HUNTER_ENABLED) IF(ASSIMP_HUNTER_ENABLED)
include("cmake-modules/HunterGate.cmake") include("cmake-modules/HunterGate.cmake")
HunterGate( HunterGate(
URL "https://github.com/cpp-pm/hunter/archive/v0.25.3.tar.gz" URL "https://github.com/cpp-pm/hunter/archive/v0.25.5.tar.gz"
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3" SHA1 "a20151e4c0740ee7d0f9994476856d813cdead29"
) )
add_definitions(-DASSIMP_USE_HUNTER) add_definitions(-DASSIMP_USE_HUNTER)
ENDIF() ENDIF()

1
include/assimp/matrix4x4.h
View File

@ -53,6 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/vector3.h> #include <assimp/vector3.h>
#include <assimp/defs.h> #include <assimp/defs.h>
#include <assimp/config.h>
#ifdef __cplusplus #ifdef __cplusplus