diff options
author | Jörg Müller <nexyon@gmail.com> | 2015-06-16 11:03:35 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2015-07-28 15:01:53 +0300 |
commit | a0cbebf404d6c46e59b090e7217ce39d7e760809 (patch) | |
tree | fad66bb8f714c160c3a3f016e1fba1711824e34d /source/gameengine/Converter | |
parent | 58956f3b91e581ef7040371dda3e3595902c18d9 (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/gameengine/Converter')
-rw-r--r-- | source/gameengine/Converter/CMakeLists.txt | 11 | ||||
-rw-r--r-- | source/gameengine/Converter/KX_ConvertActuators.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/Converter/SConscript | 5 |
3 files changed, 9 insertions, 13 deletions
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index dba3f4da050..4db9fcebd06 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -113,14 +113,11 @@ if(WITH_BULLET) endif() if(WITH_AUDASPACE) - add_definitions(-DWITH_AUDASPACE) + add_definitions(${AUDASPACE_DEFINITIONS}) - if(WITH_EXTERNAL_AUDASPACE) - add_definitions(-DWITH_EXTERNAL_AUDASPACE) - list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) - else() - list(APPEND INC ../../../intern/audaspace/intern) - endif() + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ) endif() blender_add_lib(ge_converter "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp index 65290ae4f2c..3b36e094a75 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.cpp +++ b/source/gameengine/Converter/KX_ConvertActuators.cpp @@ -42,11 +42,7 @@ #include "KX_ConvertActuators.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Sound.h> -# else -# include "AUD_C-API.h" -# endif +# include AUD_SOUND_H #endif // Actuators diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index affd4c94ed8..6336fcd3906 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -37,7 +37,6 @@ incs = [ '#intern/guardedalloc', '#intern/string', '#source/blender', - '#intern/audaspace/intern', '#intern/moto/include', '#source/blender/blenkernel', '#source/blender/blenlib', @@ -79,6 +78,10 @@ if env['WITH_BF_PYTHON']: incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') |