Blender Git Loki
Git Commits -> Revision a0cbebf
Revision a0cbebf by Joerg Mueller (master) July 28, 2015, 12:01 (GMT) |
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. |
Commit Details:
Full Hash: a0cbebf404d6c46e59b090e7217ce39d7e760809
Parent Commit: 58956f3
Lines Changed: +272, -210
53 Modified Paths:
/build_files/cmake/macros.cmake (+2, -2) (Diff)
/build_files/cmake/Modules/FindAudaspace.cmake (+59, -28) (Diff)
/build_files/scons/config/darwin-config.py (+2, -0) (Diff)
/build_files/scons/config/linux-config.py (+2, -0) (Diff)
/build_files/scons/config/win32-mingw-config.py (+2, -0) (Diff)
/build_files/scons/config/win32-vc-config.py (+2, -0) (Diff)
/build_files/scons/config/win64-mingw-config.py (+2, -0) (Diff)
/build_files/scons/config/win64-vc-config.py (+2, -0) (Diff)
/build_files/scons/tools/btools.py (+6, -0) (Diff)
/CMakeLists.txt (+41, -3) (Diff)
/intern/audaspace/CMakeLists.txt (+3, -3) (Diff)
/intern/audaspace/intern/AUD_PyInit.cpp (+3, -3) (Diff)
/intern/audaspace/SConscript (+4, -0) (Diff)
/SConstruct (+13, -1) (Diff)
/source/blender/blenkernel/BKE_sound.h (+3, -5) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+4, -10) (Diff)
/source/blender/blenkernel/intern/nla.c (+1, -5) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+1, -5) (Diff)
/source/blender/blenkernel/intern/sound.c (+7, -9) (Diff)
/source/blender/blenkernel/intern/writeffmpeg.c (+2, -6) (Diff)
/source/blender/blenkernel/SConscript (+4, -1) (Diff)
/source/blender/editors/sound/CMakeLists.txt (+5, -8) (Diff)
/source/blender/editors/sound/SConscript (+4, -1) (Diff)
/source/blender/editors/sound/sound_ops.c (+1, -5) (Diff)
/source/blender/editors/space_graph/CMakeLists.txt (+4, -7) (Diff)
/source/blender/editors/space_graph/graph_edit.c (+1, -5) (Diff)
/source/blender/editors/space_graph/SConscript (+4, -1) (Diff)
/source/blender/editors/space_sequencer/CMakeLists.txt (+4, -7) (Diff)
/source/blender/editors/space_sequencer/SConscript (+4, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+1, -5) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+4, -8) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+1, -7) (Diff)
/source/blender/makesrna/intern/SConscript (+4, -1) (Diff)
/source/blender/makesrna/SConscript (+0, -1) (Diff)
/source/blender/python/SConscript (+0, -1) (Diff)
/source/blender/windowmanager/CMakeLists.txt (+4, -3) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+6, -3) (Diff)
/source/blender/windowmanager/SConscript (+4, -1) (Diff)
/source/creator/CMakeLists.txt (+10, -0) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+1, -5) (Diff)
/source/gameengine/BlenderRoutines/CMakeLists.txt (+4, -7) (Diff)
/source/gameengine/BlenderRoutines/SConscript (+4, -1) (Diff)
/source/gameengine/Converter/CMakeLists.txt (+4, -7) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+1, -5) (Diff)
/source/gameengine/Converter/SConscript (+4, -1) (Diff)
/source/gameengine/GamePlayer/ghost/CMakeLists.txt (+4, -7) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+1, -5) (Diff)
/source/gameengine/GamePlayer/ghost/SConscript (+4, -1) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+5, -10) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_SoundActuator.cpp (+6, -6) (Diff)
/source/gameengine/Ketsji/KX_SoundActuator.h (+2, -6) (Diff)
/source/gameengine/Ketsji/SConscript (+5, -2) (Diff)
/build_files/cmake/Modules/FindAudaspace.cmake (+59, -28) (Diff)
/build_files/scons/config/darwin-config.py (+2, -0) (Diff)
/build_files/scons/config/linux-config.py (+2, -0) (Diff)
/build_files/scons/config/win32-mingw-config.py (+2, -0) (Diff)
/build_files/scons/config/win32-vc-config.py (+2, -0) (Diff)
/build_files/scons/config/win64-mingw-config.py (+2, -0) (Diff)
/build_files/scons/config/win64-vc-config.py (+2, -0) (Diff)
/build_files/scons/tools/btools.py (+6, -0) (Diff)
/CMakeLists.txt (+41, -3) (Diff)
/intern/audaspace/CMakeLists.txt (+3, -3) (Diff)
/intern/audaspace/intern/AUD_PyInit.cpp (+3, -3) (Diff)
/intern/audaspace/SConscript (+4, -0) (Diff)
/SConstruct (+13, -1) (Diff)
/source/blender/blenkernel/BKE_sound.h (+3, -5) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+4, -10) (Diff)
/source/blender/blenkernel/intern/nla.c (+1, -5) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+1, -5) (Diff)
/source/blender/blenkernel/intern/sound.c (+7, -9) (Diff)
/source/blender/blenkernel/intern/writeffmpeg.c (+2, -6) (Diff)
/source/blender/blenkernel/SConscript (+4, -1) (Diff)
/source/blender/editors/sound/CMakeLists.txt (+5, -8) (Diff)
/source/blender/editors/sound/SConscript (+4, -1) (Diff)
/source/blender/editors/sound/sound_ops.c (+1, -5) (Diff)
/source/blender/editors/space_graph/CMakeLists.txt (+4, -7) (Diff)
/source/blender/editors/space_graph/graph_edit.c (+1, -5) (Diff)
/source/blender/editors/space_graph/SConscript (+4, -1) (Diff)
/source/blender/editors/space_sequencer/CMakeLists.txt (+4, -7) (Diff)
/source/blender/editors/space_sequencer/SConscript (+4, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+1, -5) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+4, -8) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+1, -7) (Diff)
/source/blender/makesrna/intern/SConscript (+4, -1) (Diff)
/source/blender/makesrna/SConscript (+0, -1) (Diff)
/source/blender/python/SConscript (+0, -1) (Diff)
/source/blender/windowmanager/CMakeLists.txt (+4, -3) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+6, -3) (Diff)
/source/blender/windowmanager/SConscript (+4, -1) (Diff)
/source/creator/CMakeLists.txt (+10, -0) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+1, -5) (Diff)
/source/gameengine/BlenderRoutines/CMakeLists.txt (+4, -7) (Diff)
/source/gameengine/BlenderRoutines/SConscript (+4, -1) (Diff)
/source/gameengine/Converter/CMakeLists.txt (+4, -7) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+1, -5) (Diff)
/source/gameengine/Converter/SConscript (+4, -1) (Diff)
/source/gameengine/GamePlayer/ghost/CMakeLists.txt (+4, -7) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+1, -5) (Diff)
/source/gameengine/GamePlayer/ghost/SConscript (+4, -1) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+5, -10) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_SoundActuator.cpp (+6, -6) (Diff)
/source/gameengine/Ketsji/KX_SoundActuator.h (+2, -6) (Diff)
/source/gameengine/Ketsji/SConscript (+5, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021