Revision: 19371
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19371
Author: ben2610
Date: 2009-03-22 23:39:07 +0100 (Sun, 22 Mar 2009)
Log Message:
-----------
MSVC project file updated for ffmpeg 0.5 and armature. You must update
lib/windows to get the updated ffmpeg libraries.
Modified Paths:
--------------
trunk/blender/extern/bullet2/make/msvc_9_0/Bullet.vcproj
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
trunk/blender/projectfiles_vc9/blender/blender.vcproj
trunk/blender/projectfiles_vc9/blender/src/BL_src.vcproj
trunk/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
trunk/blender/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.h
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
trunk/blender/source/gameengine/Ketsji/KX_Light.cpp
trunk/blender/source/gameengine/Ketsji/KX_MotionState.cpp
trunk/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
trunk/blender/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
trunk/blender/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
trunk/blender/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.h
trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
trunk/blender/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/PHY_DynamicTypes.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
trunk/blender/source/gameengine/SceneGraph/SG_IObject.cpp
trunk/blender/source/gameengine/SceneGraph/SG_IObject.h
trunk/blender/source/gameengine/SceneGraph/SG_Node.cpp
trunk/blender/source/gameengine/SceneGraph/SG_Node.h
trunk/blender/source/gameengine/SceneGraph/SG_ParentRelation.h
trunk/blender/source/gameengine/SceneGraph/SG_Spatial.cpp
trunk/blender/source/gameengine/SceneGraph/SG_Spatial.h
Modified: trunk/blender/extern/bullet2/make/msvc_9_0/Bullet.vcproj
===================================================================
--- trunk/blender/extern/bullet2/make/msvc_9_0/Bullet.vcproj 2009-03-22
22:07:52 UTC (rev 19370)
+++ trunk/blender/extern/bullet2/make/msvc_9_0/Bullet.vcproj 2009-03-22
22:39:07 UTC (rev 19371)
@@ -445,6 +445,10 @@
Name="Dynamics"
>
<File
+
RelativePath="..\..\src\BulletDynamics\Dynamics\btActionInterface.h"
+ >
+ </File>
+ <File
RelativePath="..\..\src\BulletDynamics\Dynamics\btContinuousDynamicsWorld.cpp"
>
</File>
Modified:
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
===================================================================
---
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
2009-03-22 22:07:52 UTC (rev 19370)
+++
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
2009-03-22 22:39:07 UTC (rev 19371)
@@ -350,13 +350,13 @@
for (int i=0;i<clampedSimulationSteps;i++)
{
internalSingleStepSimulation(fixedTimeStep);
- synchronizeMotionStates();
+ //synchronizeMotionStates();
}
}
+ //else
+ // synchronizeMotionStates();
- synchronizeMotionStates();
-
clearForces();
#ifndef BT_NO_PROFILE
Modified: trunk/blender/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/blender/blender.vcproj 2009-03-22
22:07:52 UTC (rev 19370)
+++ trunk/blender/projectfiles_vc9/blender/blender.vcproj 2009-03-22
22:39:07 UTC (rev 19371)
@@ -73,7 +73,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib
IlmImf.lib Imath.lib IlmThread.lib avcodec-51.lib avformat-52.lib avutil-49.lib
swscale-0.lib avdevice-52.lib"
+ AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib
IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib
swscale-0.lib avdevice-52.lib"
ShowProgress="0"
OutputFile="..\..\bin\blender.exe"
LinkIncremental="1"
@@ -167,7 +167,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386
"
- AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25_d.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib
Imath.lib IlmImf.lib IlmThread.lib avcodec-51.lib avformat-52.lib
avdevice-52.lib avutil-49.lib swscale-0.lib"
+ AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25_d.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib
Imath.lib IlmImf.lib IlmThread.lib avcodec-52.lib avformat-52.lib
avdevice-52.lib avutil-50.lib swscale-0.lib"
ShowProgress="0"
OutputFile="..\..\bin\debug\blender.exe"
LinkIncremental="2"
Modified: trunk/blender/projectfiles_vc9/blender/src/BL_src.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/blender/src/BL_src.vcproj 2009-03-22
22:07:52 UTC (rev 19370)
+++ trunk/blender/projectfiles_vc9/blender/src/BL_src.vcproj 2009-03-22
22:39:07 UTC (rev 19371)
@@ -4,6 +4,7 @@
Version="9,00"
Name="BL_src"
ProjectGUID="{FB88301F-F725-401B-ACD7-D2ABBF333B71}"
+ RootNamespace="BL_src"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -173,10 +174,6 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
-
RelativePath="..\..\..\source\blender\src\autoarmature.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\src\B.blend.c"
>
</File>
@@ -337,6 +334,18 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\src\editarmature_generate.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\src\editarmature_retarget.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\src\editarmature_sketch.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\editconstraint.c"
>
</File>
@@ -866,6 +875,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BDR_sketch.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BDR_unwrapper.h"
>
</File>
@@ -990,6 +1003,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BIF_generate.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BIF_gl.h"
>
</File>
@@ -1050,6 +1067,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BIF_poselib.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BIF_poseobject.h"
>
</File>
@@ -1070,6 +1091,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BIF_retarget.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BIF_retopo.h"
>
</File>
@@ -1082,6 +1107,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BIF_sketch.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BIF_space.h"
>
</File>
@@ -1110,6 +1139,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BIF_verse.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BIF_writeavicodec.h"
>
</File>
Modified:
trunk/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
2009-03-22 22:07:52 UTC (rev 19370)
+++ trunk/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
2009-03-22 22:39:07 UTC (rev 19371)
@@ -72,7 +72,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386
"
- AdditionalDependencies="odelib.lib fmodvc.lib
ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib
openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib
qtmlClient.lib SDL.lib freetype2ST.lib python25_d.lib pthreadVSE2.lib
pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib
avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib avdevice-52.lib"
+ AdditionalDependencies="odelib.lib fmodvc.lib
ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib
openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib
qtmlClient.lib SDL.lib freetype2ST.lib python25_d.lib pthreadVSE2.lib
pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib
avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
ShowProgress="0"
OutputFile="..\..\..\..\bin\debug\blenderplayer.exe"
LinkIncremental="2"
@@ -166,7 +166,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odelib.lib fmodvc.lib
ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib
openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib
qtmlClient.lib SDL.lib freetype2ST.lib python25_d.lib pthreadVSE2.lib
pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib
avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib avdevice-52.lib"
+ AdditionalDependencies="odelib.lib fmodvc.lib
ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib
openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib
qtmlClient.lib SDL.lib freetype2ST.lib python25_d.lib pthreadVSE2.lib
pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib
avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
OutputFile="..\..\..\..\bin\blenderplayer.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified:
trunk/blender/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
===================================================================
---
trunk/blender/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
2009-03-22 22:07:52 UTC (rev 19370)
+++
trunk/blender/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
2009-03-22 22:39:07 UTC (rev 19371)
@@ -4,6 +4,7 @@
Version="9,00"
Name="PHY_Bullet"
ProjectGUID="{E90C7BC2-CF30-4A60-A8F2-0050D592E358}"
+ RootNamespace="PHY_Bullet"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -41,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\kernel\gen_system"
+
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\blender\makesdna"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -109,7 +110,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
