Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Patch for CMakeLists.txt to build with new OpenAL libs on VS2012.

Browse Source 
Because of crashing issue with old Creative Labs OpenAL on Windows 8 x64.
This commit is contained in:
Jürgen Herrmann
2013-05-15 11:26:57 +00:00
parent 98beda156c
commit 7b9a321a79
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -984,7 +984,11 @@ elseif(WIN32)
if(WITH_OPENAL) if(WITH_OPENAL)
set(OPENAL ${LIBDIR}/openal) set(OPENAL ${LIBDIR}/openal)
set(OPENAL_INCLUDE_DIR ${OPENAL}/include) set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
if(MSVC11)
set(OPENAL_LIBRARY openal32)
else()
set(OPENAL_LIBRARY wrap_oal) set(OPENAL_LIBRARY wrap_oal)
endif()
set(OPENAL_LIBPATH ${OPENAL}/lib) set(OPENAL_LIBPATH ${OPENAL}/lib)
endif() endif()

8
source/creator/CMakeLists.txt
View File

@@ -628,6 +628,13 @@ elseif(WIN32)
endif() endif()
if(WITH_OPENAL) if(WITH_OPENAL)
if(MSVC11)
install(
FILES
${LIBDIR}/openal/lib/OpenAL32.dll
DESTINATION ${TARGETDIR}
)
else()
install( install(
FILES FILES
${LIBDIR}/openal/lib/OpenAL32.dll ${LIBDIR}/openal/lib/OpenAL32.dll
@@ -635,6 +642,7 @@ elseif(WIN32)
DESTINATION ${TARGETDIR} DESTINATION ${TARGETDIR}
) )
endif() endif()
endif()
if(WITH_JACK AND MSVC11) if(WITH_JACK AND MSVC11)
if(CMAKE_CL_64) if(CMAKE_CL_64)