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:
authorJörg Müller <nexyon@gmail.com>2015-06-16 11:03:35 +0300
committerJörg Müller <nexyon@gmail.com>2015-07-28 15:01:53 +0300
commita0cbebf404d6c46e59b090e7217ce39d7e760809 (patch)
treefad66bb8f714c160c3a3f016e1fba1711824e34d /source/creator
parent58956f3b91e581ef7040371dda3e3595902c18d9 (diff)
Audaspace: fixing problems for the merge to master suggested by Campbell and Sergey.
- rename WITH_EXTERNAL_AUDASPACE to WITH_SYSTEM_AUDASPACE. - rename C/PYAUDASPACE to AUDASPACE_C/PY - simplifying cmake defines and includes. - fixing include paths and enabling WITH_SYSTEM_AUDASPACE for windows. - fixing scons building. - other minor build system fixes.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index f0b6001cca1..5930fd36988 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -794,6 +794,16 @@ elseif(WIN32)
DESTINATION "."
)
endif()
+
+ if(WITH_SYSTEM_AUDASPACE)
+ install(
+ FILES
+ ${LIBDIR}/audaspace/lib/audaspace.dll
+ ${LIBDIR}/audaspace/lib/audaspace-c.dll
+ ${LIBDIR}/audaspace/lib/audaspace-py.dll
+ DESTINATION "."
+ )
+ endif()
if(NOT CMAKE_CL_64)
install(