[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56818] trunk/blender: Patch for CMakeLists.txt to build with new OpenAL libs on VS2012.

[Jürgen Herrmann]

Revision: 56818
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56818
Author:   shadowrom
Date:     2013-05-15 11:26:57 +0000 (Wed, 15 May 2013)
Log Message:
-----------
Patch for CMakeLists.txt to build with new OpenAL libs on VS2012.
Because of crashing issue with old Creative Labs OpenAL on Windows 8 x64.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-05-15 11:22:52 UTC (rev 56817)
+++ trunk/blender/CMakeLists.txt	2013-05-15 11:26:57 UTC (rev 56818)
@@ -984,7 +984,11 @@
 	if(WITH_OPENAL)
 		set(OPENAL ${LIBDIR}/openal)
 		set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-		set(OPENAL_LIBRARY wrap_oal)
+		if(MSVC11)
+			set(OPENAL_LIBRARY openal32)
+		else()
+			set(OPENAL_LIBRARY wrap_oal)
+		endif()
 		set(OPENAL_LIBPATH ${OPENAL}/lib)
 	endif()
 

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2013-05-15 11:22:52 UTC (rev 56817)
+++ trunk/blender/source/creator/CMakeLists.txt	2013-05-15 11:26:57 UTC (rev 56818)
@@ -628,12 +628,20 @@
 	endif()
 
 	if(WITH_OPENAL)
-		install(
-			FILES
-				${LIBDIR}/openal/lib/OpenAL32.dll
-				${LIBDIR}/openal/lib/wrap_oal.dll
-			DESTINATION ${TARGETDIR}
-		)
+		if(MSVC11)
+			install(
+				FILES
+					${LIBDIR}/openal/lib/OpenAL32.dll
+				DESTINATION ${TARGETDIR}
+			)
+		else()
+			install(
+				FILES
+					${LIBDIR}/openal/lib/OpenAL32.dll
+					${LIBDIR}/openal/lib/wrap_oal.dll
+				DESTINATION ${TARGETDIR}
+			)
+		endif()
 	endif()
 
 	if(WITH_JACK AND MSVC11)