Merge branch 'master' into fbx_embedded_ascii

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__:
 

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" )