Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt6
-rw-r--r--source/creator/CMakeLists.txt20
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)