From a0cbebf404d6c46e59b090e7217ce39d7e760809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Tue, 16 Jun 2015 10:03:35 +0200 Subject: 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. --- CMakeLists.txt | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index cac75d339b6..591942cc8fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -247,8 +247,13 @@ option(WITH_HEADLESS "Build without graphical support (renderfarm, server m mark_as_advanced(WITH_HEADLESS) option(WITH_AUDASPACE "Build with blenders audio library (only disable if you know what you're doing!)" ON) -option(WITH_EXTERNAL_AUDASPACE "Build with external audaspace library installed on the system (only enable if you know what you're doing!)" OFF) +option(WITH_SYSTEM_AUDASPACE "Build with external audaspace library installed on the system (only enable if you know what you're doing!)" OFF) mark_as_advanced(WITH_AUDASPACE) +mark_as_advanced(WITH_SYSTEM_AUDASPACE) + +if(NOT WITH_AUDASPACE) + set(WITH_SYSTEM_AUDASPACE OFF) +endif() option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON) @@ -707,6 +712,29 @@ if(HAVE_STDBOOL_H) add_definitions(-DHAVE_STDBOOL_H) endif() +if(WITH_AUDASPACE) + if(WITH_SYSTEM_AUDASPACE) + add_definitions("-DAUD_DEVICE_H=") + add_definitions("-DAUD_SPECIAL_H=") + add_definitions("-DAUD_SOUND_H=") + add_definitions("-DAUD_HANDLE_H=") + add_definitions("-DAUD_SEQUENCE_H=") + add_definitions("-DAUD_TYPES_H=") + add_definitions("-DAUD_PYTHON_H=") + set(AUDASPACE_DEFINITIONS -DWITH_AUDASPACE -DWITH_SYSTEM_AUDASPACE) + else() + add_definitions("-DAUD_DEVICE_H=") + add_definitions("-DAUD_SPECIAL_H=") + add_definitions("-DAUD_SOUND_H=") + add_definitions("-DAUD_HANDLE_H=") + add_definitions("-DAUD_SEQUENCE_H=") + add_definitions("-DAUD_TYPES_H=") + set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern") + set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern") + set(AUDASPACE_DEFINITIONS -DWITH_AUDASPACE) + endif() +endif() + #----------------------------------------------------------------------------- # Check for valid directories # ... a partial checkout may cause this. @@ -884,9 +912,9 @@ if(UNIX AND NOT APPLE) endif() # Audio IO - if(WITH_EXTERNAL_AUDASPACE) + if(WITH_SYSTEM_AUDASPACE) find_package_wrapper(Audaspace) - if(NOT AUDASPACE_FOUND OR NOT CAUDASPACE_FOUND) + if(NOT AUDASPACE_FOUND OR NOT AUDASPACE_C_FOUND) message(FATAL_ERROR "Audaspace external library not found!") endif() endif() @@ -1550,6 +1578,16 @@ elseif(WIN32) set(SDL_LIBPATH ${SDL}/lib) endif() + # Audio IO + if(WITH_SYSTEM_AUDASPACE) + set(AUDASPACE_INCLUDE_DIRS ${LIBDIR}/audaspace/include/audaspace) + set(AUDASPACE_LIBRARIES ${LIBDIR}/audaspace/lib/audaspace.lib) + set(AUDASPACE_C_INCLUDE_DIRS ${LIBDIR}/audaspace/include/audaspace) + set(AUDASPACE_C_LIBRARIES ${LIBDIR}/audaspace/lib/audaspace-c.lib) + set(AUDASPACE_PY_INCLUDE_DIRS ${LIBDIR}/audaspace/include/audaspace) + set(AUDASPACE_PY_LIBRARIES ${LIBDIR}/audaspace/lib/audaspace-py.lib) + endif() + # used in many places so include globally, like OpenGL blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}") -- cgit v1.2.3