From 2ceb18746b7fac7d63365aa24ac2f1d4ae028fa5 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 17 Nov 2021 08:28:07 +0100 Subject: [PATCH 1/3] Append '-SOVERSION' to DLL base file name for mingw builds to match common style --- code/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index f5f3d754e..f29c602c6 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1261,6 +1261,12 @@ SET_TARGET_PROPERTIES( assimp PROPERTIES OUTPUT_NAME assimp${LIBRARY_SUFFIX} ) +if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX AND BUILD_SHARED_LIBS) + set_target_properties(assimp PROPERTIES + SUFFIX "-${ASSIMP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}" + ) +endif() + if (APPLE) if (ASSIMP_BUILD_FRAMEWORK) SET_TARGET_PROPERTIES( assimp PROPERTIES From 60bfde78eba2e677e356e02147c8e53c407e1cc7 Mon Sep 17 00:00:00 2001 From: ruyo Date: Sun, 21 Nov 2021 23:23:22 +0900 Subject: [PATCH 2/3] Fixed an incorrect indeiciesType in the glTF2 sparse accessor. --- code/AssetLib/glTF2/glTF2Asset.inl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/AssetLib/glTF2/glTF2Asset.inl b/code/AssetLib/glTF2/glTF2Asset.inl index b570fc8e6..e0a505297 100644 --- a/code/AssetLib/glTF2/glTF2Asset.inl +++ b/code/AssetLib/glTF2/glTF2Asset.inl @@ -863,6 +863,9 @@ inline void Accessor::Read(Value &obj, Asset &r) { //indices componentType sparse->indicesType = MemberOrDefault(*indicesValue, "componentType", ComponentType_BYTE); //sparse->indices->Read(*indicesValue, r); + } else { + // indicesType + sparse->indicesType = MemberOrDefault(*sparseValue, "componentType", ComponentType_UNSIGNED_SHORT); } // value @@ -875,8 +878,6 @@ inline void Accessor::Read(Value &obj, Asset &r) { //sparse->values->Read(*valuesValue, r); } - // indicesType - sparse->indicesType = MemberOrDefault(*sparseValue, "componentType", ComponentType_UNSIGNED_SHORT); const unsigned int elementSize = GetElementSize(); const size_t dataSize = count * elementSize; From 6819b84b8b527e3dd763368357fb7ed6a3c59f05 Mon Sep 17 00:00:00 2001 From: Robin Dousse Date: Mon, 22 Nov 2021 09:20:59 +0100 Subject: [PATCH 3/3] Use adviced c++ flag to supress warning on mingw --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 091ab2d3f..405f0b4e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -288,12 +288,11 @@ ELSEIF( CMAKE_COMPILER_IS_MINGW ) message(WARNING "MinGW is old, if you experience errors, update MinGW.") ENDIF() IF(NOT ASSIMP_HUNTER_ENABLED) - SET(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") + SET(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}") SET(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}") ENDIF() SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wa,-mbig-obj -O3 ${CMAKE_CXX_FLAGS}") SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}") - ADD_DEFINITIONS( -U__STRICT_ANSI__ ) ENDIF() IF ( IOS AND NOT ASSIMP_HUNTER_ENABLED)