==== MSVC 7 project files ===

maintenance work:
- added missing files in blenkernel
- updated Bullet in extern
- Python: SurfNurb.c
- removed compile and dependency of PHY_Ode
- made blenderplayer compile again (had to add pthreads lib)

diff --git a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
index 7bd6d7bb0c7e3bd7709659fb3f130617240e49ed..e4efb3419b8f47959485aae7c5f010913c2ec068 100644 (file)
--- a/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
+++ b/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
@@ -835,6 +835,12 @@ ECHO Done
                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
                                        </FileConfiguration>
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.cpp">
+                               </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp">
                                        <FileConfiguration
@@ -917,7 +923,7 @@ ECHO Done
                                        </FileConfiguration>
                                </File>
                                <File
-                                       RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleCallback.cpp">
+                                       RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleMeshShape.cpp">
                                </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.cpp">
@@ -1087,6 +1093,9 @@ ECHO Done
                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
                                        </FileConfiguration>
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp">
                                        <FileConfiguration
@@ -1190,6 +1199,12 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\CollisionShape.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.h">
+                               </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.h">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h">
                                </File>
@@ -1200,7 +1215,7 @@ ECHO Done
                                        RelativePath="..\..\Bullet\CollisionShapes\ConvexShape.h">
                                </File>
                                <File
-                                       RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleCallback.h">
+                                       RelativePath="..\..\Bullet\CollisionShapes\ConvexTriangleMeshShape.h">
                                </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\CylinderShape.h">
@@ -1226,6 +1241,9 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.h">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h">
                                </File>
@@ -1312,6 +1330,9 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.cpp">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\BroadphaseCollision\OverlappingPairCache.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.cpp">
                                        <FileConfiguration
@@ -1358,6 +1379,9 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\BroadphaseCollision\Dispatcher.h">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\BroadphaseCollision\OverlappingPairCache.h">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\BroadphaseCollision\SimpleBroadphase.h">
                                </File>
@@ -1452,6 +1476,9 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\CollisionDispatch\CollisionWorld.cpp">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionDispatch\CompoundCollisionAlgorithm.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionDispatch\ConvexConcaveCollisionAlgorithm.cpp">
                                </File>
@@ -1464,6 +1491,9 @@ ECHO Done
                                <File
                                        RelativePath="..\..\Bullet\CollisionDispatch\ManifoldResult.cpp">
                                </File>
+                               <File
+                                       RelativePath="..\..\Bullet\CollisionDispatch\SimulationIslandManager.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\Bullet\CollisionDispatch\UnionFind.cpp">
                                </File>

diff --git a/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj b/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
index fddaff5b675c81c800137a5a19732cb363c6bc30..7f20dc3fa208565af66a8d43b24a4db4bfe6f79c 100644 (file)
--- a/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
+++ b/extern/bullet/make/msvc_7_0/Dynamics/BulletDynamics_vc7.vcproj
@@ -286,34 +286,10 @@ ECHO Done
                                        </FileConfiguration>
                                </File>
                                <File
-                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp">
+                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.cpp">
                                </File>
                                <File
-                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.cpp">
-                                       <FileConfiguration
-                                               Name="Blender Debug|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Blender Release|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="3D Plugin Debug|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="3D Plugin Release|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
+                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\HingeConstraint.cpp">
                                </File>
                                <File
                                        RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.cpp">
@@ -343,31 +319,7 @@ ECHO Done
                                        </FileConfiguration>
                                </File>
                                <File
-                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.cpp">
-                                       <FileConfiguration
-                                               Name="Blender Debug|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Blender Release|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="3D Plugin Debug|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="3D Plugin Release|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
+                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SequentialImpulseConstraintSolver.cpp">
                                </File>
                                <File
                                        RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.cpp">
@@ -396,33 +348,6 @@ ECHO Done
                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
                                        </FileConfiguration>
                                </File>
-                               <File
-                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SorLcp.cpp">
-                                       <FileConfiguration
-                                               Name="Blender Debug|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Blender Release|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="3D Plugin Debug|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="3D Plugin Release|Win32">
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                       </FileConfiguration>
-                               </File>
                                <File
                                        RelativePath="..\..\..\BulletDynamics\ConstraintSolver\TypedConstraint.cpp">
                                </File>
@@ -440,23 +365,20 @@ ECHO Done
                                        RelativePath="..\..\..\BulletDynamics\ConstraintSolver\ContactSolverInfo.h">
                                </File>
                                <File
-                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\JacobianEntry.h">
+                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Generic6DofConstraint.h">
                                </File>
                                <File
-                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\OdeConstraintSolver.h">
+                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\JacobianEntry.h">
                                </File>
                                <File
                                        RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Point2PointConstraint.h">
                                </File>
                                <File
-                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SimpleConstraintSolver.h">
+                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SequentialImpulseConstraintSolver.h">
                                </File>
                                <File
                                        RelativePath="..\..\..\BulletDynamics\ConstraintSolver\Solve2LinearConstraint.h">
                                </File>
-                               <File
-                                       RelativePath="..\..\..\BulletDynamics\ConstraintSolver\SorLcp.h">
-                               </File>
                                <File
                                        RelativePath="..\..\..\BulletDynamics\ConstraintSolver\TypedConstraint.h">
                                </File>

diff --git a/intern/boolop/make/msvc_7_0/boolop.vcproj b/intern/boolop/make/msvc_7_0/boolop.vcproj
index d7157896427e62a9ec31243a8cbba6d282554093..c435d0626d528439f04774a561108f98c90d154e 100644 (file)
--- a/intern/boolop/make/msvc_7_0/boolop.vcproj
+++ b/intern/boolop/make/msvc_7_0/boolop.vcproj
@@ -22,7 +22,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;$(NOINHERIT)"
+                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
                                PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="1"
@@ -80,7 +80,7 @@ ECHO Done
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="2"
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;$(NOINHERIT)"
+                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
                                PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
                                StringPooling="TRUE"
                                RuntimeLibrary="0"
@@ -137,7 +137,7 @@ ECHO Done
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="2"
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;$(NOINHERIT)"
+                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
                                PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
@@ -194,7 +194,7 @@ ECHO Done
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;$(NOINHERIT)"
+                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
                                PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"

diff --git a/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj b/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
index d4fcc178bcdcec3c32e7997faff42fc48675fc6d..de36cfa7456c13037167cdc2f379c15e08c87bcd 100644 (file)
--- a/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
+++ b/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
@@ -224,6 +224,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\python\api2_2x\Sound.c">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\python\api2_2x\SurfNurb.c">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\python\api2_2x\Sys.c">
                        </File>
@@ -406,6 +409,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\python\api2_2x\Sound.h">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\python\api2_2x\SurfNurb.h">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\python\api2_2x\Sys.h">
                        </File>

diff --git a/projectfiles_vc7/blender/blender.sln b/projectfiles_vc7/blender/blender.sln
index 545d4c487a4c62080119c6df40acb2899654fcad..0306ef5bd3581ce20505cb679bfe0db546a7409a 100644 (file)
--- a/projectfiles_vc7/blender/blender.sln
+++ b/projectfiles_vc7/blender/blender.sln
@@ -141,7 +141,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GP_ghost", "..\gameengine\g
                {09222F5E-1625-4FF3-A89A-384D16875EE5} = {09222F5E-1625-4FF3-A89A-384D16875EE5}
                {E013786A-9575-4F34-81B2-33290357EE87} = {E013786A-9575-4F34-81B2-33290357EE87}
                {415BFD6E-64CF-422B-AF88-C07F040A7292} = {415BFD6E-64CF-422B-AF88-C07F040A7292}
-               {EC405272-28E3-4840-AAC2-53D6DE4E163D} = {EC405272-28E3-4840-AAC2-53D6DE4E163D}
                {6B801390-5F95-4F07-81A7-97FBA046AACC} = {6B801390-5F95-4F07-81A7-97FBA046AACC}
                {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94} = {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}
                {F90BD995-FFA4-4B18-81E8-FA4322C939E8} = {F90BD995-FFA4-4B18-81E8-FA4322C939E8}
@@ -507,9 +506,7 @@ Global
                {EC405272-28E3-4840-AAC2-53D6DE4E163D}.Blender Debug.ActiveCfg = BlenderPlayer Debug|Win32
                {EC405272-28E3-4840-AAC2-53D6DE4E163D}.Blender Release.ActiveCfg = BlenderPlayer Release|Win32
                {EC405272-28E3-4840-AAC2-53D6DE4E163D}.BlenderPlayer Debug.ActiveCfg = BlenderPlayer Debug|Win32
-               {EC405272-28E3-4840-AAC2-53D6DE4E163D}.BlenderPlayer Debug.Build.0 = BlenderPlayer Debug|Win32
                {EC405272-28E3-4840-AAC2-53D6DE4E163D}.BlenderPlayer Release.ActiveCfg = BlenderPlayer Release|Win32
-               {EC405272-28E3-4840-AAC2-53D6DE4E163D}.BlenderPlayer Release.Build.0 = BlenderPlayer Release|Win32
                {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
                {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
                {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32

diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
index ab5a4145ed3d135391a6e33410287da42780f72b..d4aec5dd950b0e26479be763c701dc4fdeb7d449 100644 (file)
--- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
@@ -350,6 +350,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\intern\CCGSubSurf.c">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\blenkernel\intern\cdderivedmesh.c">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\intern\colortools.c">
                        </File>
@@ -359,6 +362,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\intern\curve.c">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\blenkernel\intern\customdata.c">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\intern\deform.c">
                        </File>
@@ -507,6 +513,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\BKE_brush.h">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\blenkernel\BKE_cdderivedmesh.h">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\BKE_colortools.h">
                        </File>
@@ -516,6 +525,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\BKE_curve.h">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\blenkernel\BKE_customdata.h">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\BKE_deform.h">
                        </File>

diff --git a/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj b/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
index 174b4523b4bd144a9b71c0f2dc1c5fb958b068aa..72e6baf25edd8930b00f4248cbdce8b4ffaca340 100644 (file)
--- a/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
+++ b/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
@@ -40,12 +40,12 @@
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386
 "
-                               AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib odelib.lib fmodvc.lib libbmfont.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libblenkey.lib libeay32.lib libpng.lib libz.lib libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib BulletDynamics.lib Bullet.lib libdecimation.lib python24_d.lib"
+                               AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib odelib.lib fmodvc.lib libbmfont.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libblenkey.lib libeay32.lib libpng.lib libz.lib libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib BulletDynamics.lib Bullet.lib libdecimation.lib python24_d.lib pthreadVSE2.lib pthreadVC2.lib"
                                ShowProgress="0"
                                OutputFile="..\..\..\..\bin\debug\blenderplayer.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern\debug;..\..\..\..\..\build\msvc_7\libs\extern\debug"
+                               AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern\debug;..\..\..\..\..\build\msvc_7\libs\extern\debug;..\..\..\..\..\lib\windows\pthreads\lib"
                                IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;msvcrtd.lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="..\..\..\..\..\build\msvc_7\libs\debug\blenderplayer.pdb"
@@ -116,11 +116,11 @@ ECHO Done
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/MACHINE:I386"
-                               AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib odelib.lib fmodvc.lib libbmfont.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libblenkey.lib libeay32.lib libpng.lib libz.lib libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib BulletDynamics.lib Bullet.lib libdecimation.lib python24.lib"
+                               AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib odelib.lib fmodvc.lib libbmfont.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libblenkey.lib libeay32.lib libpng.lib libz.lib libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib BulletDynamics.lib Bullet.lib libdecimation.lib python24.lib pthreadVSE2.lib pthreadVC2.lib"
                                OutputFile="..\..\..\..\bin\blenderplayer.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern;..\..\..\..\..\build\msvc_7\libs\extern"
+                               AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern;..\..\..\..\..\build\msvc_7\libs\extern;..\..\..\..\..\lib\windows\pthreads\lib"
                                IgnoreDefaultLibraryNames="libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib"
                                ProgramDatabaseFile="..\..\..\..\..\build\msvc_7\libs\blenderplayer.pdb"
                                SubSystem="1"/>