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. --- source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 6 +----- source/gameengine/BlenderRoutines/CMakeLists.txt | 11 ++++------- source/gameengine/BlenderRoutines/SConscript | 5 ++++- source/gameengine/Converter/CMakeLists.txt | 11 ++++------- source/gameengine/Converter/KX_ConvertActuators.cpp | 6 +----- source/gameengine/Converter/SConscript | 5 ++++- source/gameengine/GamePlayer/ghost/CMakeLists.txt | 11 ++++------- source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 6 +----- source/gameengine/GamePlayer/ghost/SConscript | 5 ++++- source/gameengine/Ketsji/CMakeLists.txt | 15 +++++---------- source/gameengine/Ketsji/KX_PythonInit.cpp | 2 +- source/gameengine/Ketsji/KX_SoundActuator.cpp | 12 ++++++------ source/gameengine/Ketsji/KX_SoundActuator.h | 8 ++------ source/gameengine/Ketsji/SConscript | 7 +++++-- 14 files changed, 46 insertions(+), 64 deletions(-) (limited to 'source/gameengine') diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 7dfefb07184..dcdc5463b04 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -102,11 +102,7 @@ typedef void * wmUIHandlerRemoveFunc; } #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include -# else -# include "AUD_C-API.h" -# endif +# include AUD_DEVICE_H #endif static BlendFileData *load_game_data(char *filename) diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index 324babf9fa9..aaeb2e10462 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -56,14 +56,11 @@ set(SRC add_definitions(${GL_DEFINITIONS}) 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() if(WITH_CODEC_FFMPEG) diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index def0bc32697..9bce7b78bf4 100644 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -39,7 +39,6 @@ incs = [ '#source/blender', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#intern/audaspace/intern', '#intern/ghost/include', '#intern/moto/include', '#source/blender/blenfont', @@ -67,6 +66,10 @@ incs = [ ] incs = ' '.join(incs) +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') 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 -# 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') diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index 58e47bc4440..48938b11cb9 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -85,14 +85,11 @@ if(WITH_INTERNATIONAL) 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() if(WITH_SDL AND WITH_SDL_DYNLOAD) diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index a0c314230f5..c3eb07d18a1 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -100,11 +100,7 @@ extern "C" #include "GHOST_Rect.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include -# else -# include "AUD_C-API.h" -# endif +# include AUD_DEVICE_H #endif static void frameTimerProc(GHOST_ITimerTask* task, GHOST_TUns64 time); diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index 610abcd0357..c31bd0c2f08 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -44,7 +44,6 @@ incs = [ '#intern/memutil', '#intern/moto/include', '#intern/container', - '#intern/audaspace/intern', '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', '#source/gameengine/BlenderRoutines', '#source/gameengine/Converter', @@ -81,6 +80,10 @@ if env['WITH_BF_PYTHON']: incs += Split(env['BF_PYTHON_INC']) defs.append('WITH_PYTHON') +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs.append(env['BF_AUDASPACE_C_INC']) + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index f938994f86a..2607e2bb4b7 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -248,17 +248,12 @@ if(WITH_CODEC_FFMPEG) endif() if(WITH_AUDASPACE) - list(APPEND INC ../../../intern/audaspace/intern) + add_definitions(${AUDASPACE_DEFINITIONS}) - add_definitions(-DWITH_AUDASPACE) - - if(WITH_EXTERNAL_AUDASPACE) - add_definitions(-DWITH_EXTERNAL_AUDASPACE) - list(APPEND INC_SYS - ${CAUDASPACE_INCLUDE_DIRS} - ${PYAUDASPACE_INCLUDE_DIRS} - ) - endif() + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ${AUDASPACE_PY_INCLUDE_DIRS} + ) endif() if(WITH_BULLET) diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 2eaacf43041..4cb632ed739 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -61,7 +61,7 @@ extern "C" { # include "marshal.h" /* python header for loading/saving dicts */ } -#include "AUD_PyInit.h" +#include "../../../../intern/audaspace/intern/AUD_PyInit.h" #endif /* WITH_PYTHON */ diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp index 8f225e4d93b..14f0598d088 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.cpp +++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp @@ -37,14 +37,14 @@ #include "KX_SoundActuator.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE +# ifdef WITH_SYSTEM_AUDASPACE typedef float sample_t; -# include -# include -# include -# include -# include +# include AUD_PYTHON_H # endif +# include AUD_SOUND_H +# include AUD_SPECIAL_H +# include AUD_DEVICE_H +# include AUD_HANDLE_H #endif #include "KX_GameObject.h" diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h index 83d22142bda..5ec2fda722f 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.h +++ b/source/gameengine/Ketsji/KX_SoundActuator.h @@ -35,12 +35,8 @@ #include "SCA_IActuator.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include -# include -# else -# include "AUD_C-API.h" -# endif +# include AUD_SOUND_H +# include AUD_HANDLE_H #endif #include "BKE_sound.h" diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 8074a4064ff..5b2807d8172 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -40,8 +40,6 @@ incs = [ '#source/blender', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#intern/audaspace/FX', - '#intern/audaspace/intern', '#intern/moto/include', '#source/blender/blenfont', '#source/blender/blenkernel', @@ -86,6 +84,11 @@ 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'] + incs += ' ' + env['BF_AUDASPACE_PY_INC'] + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') -- cgit v1.2.3