[Bf-blender-cvs] [89643fc] compositor-2016: CMake/ Visual Studio 14 2015, Use one library name for openal for both 2013 and 2015

Martijn Berger noreply at git.blender.org
Wed Jun 8 21:51:45 CEST 2016


Commit: 89643fce9fbb2ea3391e6bcbe5a99a4c4fa3a885
Author: Martijn Berger
Date:   Tue May 31 14:16:29 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB89643fce9fbb2ea3391e6bcbe5a99a4c4fa3a885

CMake/ Visual Studio 14 2015, Use one library name for openal for both 2013 and 2015

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b40b92..b558fe1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1959,7 +1959,7 @@ elseif(WIN32)
 		set(OPENAL ${LIBDIR}/openal)
 		set(OPENALDIR ${LIBDIR}/openal)
 		set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-		if(MSVC12)
+		if(MSVC)
 			set(OPENAL_LIBRARY openal32)
 		else()
 			set(OPENAL_LIBRARY wrap_oal)




More information about the Bf-blender-cvs mailing list