Merge branch 'master', remote-tracking branch 'origin' into pxljm

CMake/ExternalAssimp.cmake

@@ -13,7 +13,9 @@ SET(assimp_CMAKE_ARGS
 )
 
 IF(APPLE)
-LIST(APPEND assimp_CMAKE_ARGS -DCMAKE_CXX_FLAGS_RELEASE="-O2")
+    # Work around a compiler crash building assimp on Mac
+    STRING(REPLACE "-O3" "-O2" assimp_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
+    LIST(APPEND assimp_CMAKE_ARGS -DCMAKE_CXX_FLAGS_RELEASE=${assimp_CXX_FLAGS})
 ENDIF(APPLE)
 
 ExternalProject_Add(assimp

Core/Contents/CMakeLists.txt

@@ -245,7 +245,9 @@ IF(POLYCODE_INSTALL_PLAYER)
 #    IF(POLYCODE_BUILD_SHARED)
 #        INSTALL(TARGETS Polycore_dynamic DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
 #    END(POLYCODE_BUILD_SHARED)
-    
-    INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/bin/ 
-        DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+
+    IF(MSVC)    
+        INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/bin/ 
+            DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+    ENDIF(MSVC)
 ENDIF(POLYCODE_INSTALL_PLAYER)