[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15829] branches/sound-branch: More changes to get things building.
Robert Holcomb
bob_holcomb at hotmail.com
Mon Jul 28 02:55:28 CEST 2008
Revision: 15829
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15829
Author: scourage
Date: 2008-07-28 02:55:28 +0200 (Mon, 28 Jul 2008)
Log Message:
-----------
More changes to get things building.
Modified Paths:
--------------
branches/sound-branch/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
branches/sound-branch/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/sound-branch/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_SoundActuator.cpp
Modified: branches/sound-branch/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
===================================================================
--- branches/sound-branch/projectfiles_vc7/gameengine/converter/KX_converter.vcproj 2008-07-28 00:45:16 UTC (rev 15828)
+++ branches/sound-branch/projectfiles_vc7/gameengine/converter/KX_converter.vcproj 2008-07-28 00:55:28 UTC (rev 15829)
@@ -126,7 +126,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\..\build\msvc_7\extern\tinySND\include;..\..\..\..\lib\windows\samplerate\include"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\..\build\msvc_7\extern\tinySND\include;..\..\..\..\lib\windows\samplerate\include;..\..\..\source\gameengine\Audio"
PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Modified: branches/sound-branch/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
===================================================================
--- branches/sound-branch/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj 2008-07-28 00:45:16 UTC (rev 15828)
+++ branches/sound-branch/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj 2008-07-28 00:55:28 UTC (rev 15829)
@@ -126,7 +126,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\SoundSystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\..\build\msvc_7\extern\tinySND\include;..\..\..\..\lib\windows\samplerate\include"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\SoundSystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\..\build\msvc_7\extern\tinySND\include;..\..\..\..\lib\windows\samplerate\include;..\..\..\source\gameengine\Audio"
PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Modified: branches/sound-branch/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- branches/sound-branch/source/gameengine/Converter/KX_ConvertActuators.cpp 2008-07-28 00:45:16 UTC (rev 15828)
+++ branches/sound-branch/source/gameengine/Converter/KX_ConvertActuators.cpp 2008-07-28 00:55:28 UTC (rev 15829)
@@ -92,6 +92,7 @@
#include "BL_BlenderDataConversion.h"
#include "SND_GameCDObject.h"
+#include "SND_GameDefines.h"
/**
KX_BLENDERTRUNC needed to round 'almost' zero values to zero, else velocities etc. are incorrectly set
Modified: branches/sound-branch/source/gameengine/Ketsji/KX_CDActuator.cpp
===================================================================
--- branches/sound-branch/source/gameengine/Ketsji/KX_CDActuator.cpp 2008-07-28 00:45:16 UTC (rev 15828)
+++ branches/sound-branch/source/gameengine/Ketsji/KX_CDActuator.cpp 2008-07-28 00:55:28 UTC (rev 15829)
@@ -31,9 +31,11 @@
*/
#include "KX_CDActuator.h"
+#include "KX_GameObject.h"
+
#include "SND_GameCDObject.h"
-#include "KX_GameObject.h"
#include "SND_GameScene.h"
+#include "SND_GameDefines.h"
#include <iostream>
Modified: branches/sound-branch/source/gameengine/Ketsji/KX_SoundActuator.cpp
===================================================================
--- branches/sound-branch/source/gameengine/Ketsji/KX_SoundActuator.cpp 2008-07-28 00:45:16 UTC (rev 15828)
+++ branches/sound-branch/source/gameengine/Ketsji/KX_SoundActuator.cpp 2008-07-28 00:55:28 UTC (rev 15829)
@@ -31,10 +31,11 @@
*/
#include "KX_SoundActuator.h"
-#include "SND_GameSoundObject.h"
#include "KX_GameObject.h"
#include "SND_GameSoundObject.h"
#include "SND_GameScene.h" // needed for replication
+#include "SND_GameDefines.h"
+
#include <iostream>
#ifdef HAVE_CONFIG_H
More information about the Bf-blender-cvs
mailing list