[Bf-blender-cvs] [bed3cbdf3d8] blender2.8: Merge branch 'master' into blender2.8

[Germano]

Commit: bed3cbdf3d88a61cf081941c0fd96205f47ecee7
Author: Germano
Date:   Sun Oct 29 18:20:24 2017 -0200
Branches: blender2.8
https://developer.blender.org/rBbed3cbdf3d88a61cf081941c0fd96205f47ecee7

Merge branch 'master' into blender2.8

# Conflicts:
#	build_files/cmake/macros.cmake
#	build_files/cmake/platform/platform_win32.cmake

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



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

diff --cc build_files/cmake/platform/platform_win32.cmake
index 4d2342e490e,dbe3688d671..840534a254a
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@@ -36,20 -520,22 +520,21 @@@ set(WINTAB_INC ${LIBDIR}/wintab/include
  if(WITH_OPENAL)
  	set(OPENAL ${LIBDIR}/openal)
  	set(OPENALDIR ${LIBDIR}/openal)
 -	set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
 +	set(OPENAL_INCLUDE_DIR ${OPENAL}/include/AL)
+ 	set(OPENAL_LIBPATH ${OPENAL}/lib)
  	if(MSVC)
- 		set(OPENAL_LIBRARY openal32)
+ 		set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/openal32.lib)
  	else()
- 		set(OPENAL_LIBRARY wrap_oal)
+ 		set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/wrap_oal.lib)
  	endif()
- 	set(OPENAL_LIBPATH ${OPENAL}/lib)
 -	
++
  endif()
  
  if(WITH_CODEC_SNDFILE)
 -	set(SNDFILE ${LIBDIR}/sndfile)
 -	set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include)
 -	set(SNDFILE_LIBPATH ${SNDFILE}/lib) # TODO, deprecate
 -	set(SNDFILE_LIBRARIES ${SNDFILE_LIBPATH}/libsndfile-1.lib)
 -	
 +	set(LIBSNDFILE ${LIBDIR}/sndfile)
 +	set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
- 	set(LIBSNDFILE_LIBRARIES libsndfile-1)
 +	set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib) # TODO, deprecate
++	set(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBPATH}/libsndfile-1.lib)
  endif()
  
  if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)