diff options
author | Jürgen Herrmann <shadowrom@me.com> | 2013-05-15 15:26:57 +0400 |
---|---|---|
committer | Jürgen Herrmann <shadowrom@me.com> | 2013-05-15 15:26:57 +0400 |
commit | 7b9a321a79b70bbed9ee98118e58b963cea4f0dc (patch) | |
tree | c87e45dda5850a10f649010c30ffbf823340f94d | |
parent | 98beda156c5e5c05c340abc929c585b8556e99fc (diff) |
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.
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 20 |
2 files changed, 19 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c8b4e85167f..daae377e58f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -984,7 +984,11 @@ elseif(WIN32) 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() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index cd846eb1978..eabf1fc7f49 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -628,12 +628,20 @@ elseif(WIN32) 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) |