From dbd0f06d32a3156d42ef7590728adfefa2943623 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 8 Apr 2019 20:21:20 +0200 Subject: [PATCH 1/2] Update CMakeLists.txt Make IrrXml dynamic only on BSD --- contrib/irrXML/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/irrXML/CMakeLists.txt b/contrib/irrXML/CMakeLists.txt index 56a7c7e6d..7f58af3d8 100644 --- a/contrib/irrXML/CMakeLists.txt +++ b/contrib/irrXML/CMakeLists.txt @@ -13,7 +13,11 @@ if ( MSVC ) ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) endif ( MSVC ) -add_library(IrrXML ${IrrXML_SRCS}) +IF(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)") + add_library(IrrXML ${IrrXML_SRCS}) +ELSE() + add_library(IrrXML STATIC ${IrrXML_SRCS}) +ENDIF() set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" ) set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" ) From e2025c3dec2eb49fefc18d9df225c5909c92cbbc Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 10 Apr 2019 20:31:23 +0200 Subject: [PATCH 2/2] Update Readme.md Add info about C4D-importer. --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index b9babf1bd..8cd3c7cb3 100644 --- a/Readme.md +++ b/Readme.md @@ -99,7 +99,7 @@ __Importers__: Additionally, some formats are supported by dependency on non-free code or external SDKs (not built by default): -- [C4D](https://en.wikipedia.org/wiki/Cinema_4D) (https://github.com/assimp/assimp/wiki/Cinema4D-&-Melange) +- [C4D](https://en.wikipedia.org/wiki/Cinema_4D) (https://github.com/assimp/assimp/wiki/Cinema4D-&-Melange) IMporting geometry + node hierarchy are currently supported __Exporters__: