[Bf-blender-cvs] [313520cb4ec] temp-remove-mingw: Merge remote-tracking branch 'refs/remotes/origin/master' into temp-remove-mingw

[Aaron Carlisle]

Commit: 313520cb4ec4309ab7662b17a2353a78be603bd2
Author: Aaron Carlisle
Date:   Thu May 18 15:14:51 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rB313520cb4ec4309ab7662b17a2353a78be603bd2

Merge remote-tracking branch 'refs/remotes/origin/master' into temp-remove-mingw

===================================================================



===================================================================

diff --cc build_files/cmake/config/blender_full.cmake
index a35ea464bd9,ecde50ff156..cc0d52fb18d
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@@ -63,12 -63,19 +63,11 @@@ if(UNIX AND NOT APPLE
  	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
  elseif(WIN32)
  	set(WITH_JACK                OFF CACHE BOOL "" FORCE)
 -	if(NOT CMAKE_COMPILER_IS_GNUCC)
 -		set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 -	else()
 -		# MinGW exceptions
 -		set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
 -		set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 -		set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
 -	endif()
  elseif(APPLE)
  	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
- 	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
+ 	set(WITH_CODEC_QUICKTIME     OFF  CACHE BOOL "" FORCE)
  	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
- 	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
  
- 	include("${CMAKE_SOURCE_DIR}/build_files/cmake/platform/platform_apple_xcode.cmake")
- 	apple_check_quicktime()
+ #	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
+ #	apple_check_quicktime()
  endif()
diff --cc build_files/cmake/config/blender_release.cmake
index 0ef20476741,f7239559fb8..42e18aaf9db
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@@ -64,12 -64,19 +64,11 @@@ if(UNIX AND NOT APPLE
  	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
  elseif(WIN32)
  	set(WITH_JACK                OFF CACHE BOOL "" FORCE)
 -	if(NOT CMAKE_COMPILER_IS_GNUCC)
 -		set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 -	else()
 -		# MinGW exceptions
 -		set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
 -		set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 -		set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
 -	endif()
  elseif(APPLE)
  	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
- 	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
+ 	set(WITH_CODEC_QUICKTIME     OFF  CACHE BOOL "" FORCE)
  	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
- 	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
  
- 	include("${CMAKE_SOURCE_DIR}/build_files/cmake/platform/platform_apple_xcode.cmake")
- 	apple_check_quicktime()
+ #	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
+ #	apple_check_quicktime()
  endif()