diff options
author | Maarten Gribnau <mail@maartengribnau.com> | 2002-12-24 15:43:56 +0300 |
---|---|---|
committer | Maarten Gribnau <mail@maartengribnau.com> | 2002-12-24 15:43:56 +0300 |
commit | b479689cf8efe4a41dd017290064a3013e4dd336 (patch) | |
tree | c3c7f05c48702957240b2acd38f0dbee737d39ba | |
parent | 24345de435fa8f44366bdfd7d6b51e960ff9b7a6 (diff) |
Added ode physics to blender and player targets.
ActiveX control still has a linkigng problem.
Maarten
6 files changed, 128 insertions, 73 deletions
diff --git a/projectfiles/blenderpublisher/blenderpublisher.dsp b/projectfiles/blenderpublisher/blenderpublisher.dsp index fbf52954d77..11ad34d22b0 100644 --- a/projectfiles/blenderpublisher/blenderpublisher.dsp +++ b/projectfiles/blenderpublisher/blenderpublisher.dsp @@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 odelib.lib fmodvc.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg-static.a glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcpmtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\obj\windows\debug\blenderpublisher.exe" /pdbtype:sept /libpath:"..\..\lib\windows\ode\lib" /libpath:"..\..\lib\windows\bsp\lib\debug\\" /libpath:"..\..\lib\windows\moto\lib\\" /libpath:"..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\fmod\lib" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\iksolver\lib\\" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\openal\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" +# ADD LINK32 odelib.lib fmodvc.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg-static.a glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcpmtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\obj\windows\debug\blenderpublisher.exe" /pdbtype:sept /libpath:"..\..\lib\windows\ode\lib" /libpath:"..\..\lib\windows\bsp\lib\\" /libpath:"..\..\lib\windows\moto\lib\\" /libpath:"..\..\lib\windows\bmfont\lib\\" /libpath:"..\..\lib\windows\ghost\lib\\" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\fmod\lib" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\iksolver\lib\\" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\openal\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/projectfiles/creator/blendercreator.dsw b/projectfiles/creator/blendercreator.dsw index ed18e23ca1d..4cee932f4bd 100644 --- a/projectfiles/creator/blendercreator.dsw +++ b/projectfiles/creator/blendercreator.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "BKE_blenkernel"="..\blender\blenkernel\BKE_blenkernel.dsp" - Package Owner=<4> +Project: "BKE_blenkernel"=..\blender\blenkernel\BKE_blenkernel.dsp - Package Owner=<4> Package=<5> {{{ @@ -15,7 +15,7 @@ Package=<4> ############################################################################### -Project: "BLI_blenlib"="..\blender\blenlib\BLI_blenlib.dsp" - Package Owner=<4> +Project: "BLI_blenlib"=..\blender\blenlib\BLI_blenlib.dsp - Package Owner=<4> Package=<5> {{{ @@ -27,7 +27,7 @@ Package=<4> ############################################################################### -Project: "BLO_decrypt"="..\BLENDER\BLO_decrypt\BLO_decrypt.dsp" - Package Owner=<4> +Project: "BLO_decrypt"=..\BLENDER\BLO_decrypt\BLO_decrypt.dsp - Package Owner=<4> Package=<5> {{{ @@ -39,7 +39,7 @@ Package=<4> ############################################################################### -Project: "BLO_decrypt_stub"="..\blender\BLO_decrypt_stub\BLO_decrypt_stub.dsp" - Package Owner=<4> +Project: "BLO_decrypt_stub"=..\blender\BLO_decrypt_stub\BLO_decrypt_stub.dsp - Package Owner=<4> Package=<5> {{{ @@ -51,7 +51,7 @@ Package=<4> ############################################################################### -Project: "BLO_deflate"="..\blender\BLO_deflate\BLO_deflate.dsp" - Package Owner=<4> +Project: "BLO_deflate"=..\blender\BLO_deflate\BLO_deflate.dsp - Package Owner=<4> Package=<5> {{{ @@ -63,7 +63,7 @@ Package=<4> ############################################################################### -Project: "BLO_encrypt"="..\BLENDER\BLO_encrypt\BLO_encrypt.dsp" - Package Owner=<4> +Project: "BLO_encrypt"=..\BLENDER\BLO_encrypt\BLO_encrypt.dsp - Package Owner=<4> Package=<5> {{{ @@ -75,7 +75,7 @@ Package=<4> ############################################################################### -Project: "BLO_inflate"="..\BLENDER\BLO_inflate\BLO_inflate.dsp" - Package Owner=<4> +Project: "BLO_inflate"=..\BLENDER\BLO_inflate\BLO_inflate.dsp - Package Owner=<4> Package=<5> {{{ @@ -87,7 +87,7 @@ Package=<4> ############################################################################### -Project: "BLO_loader"="..\blender\loader\BLO_loader.dsp" - Package Owner=<4> +Project: "BLO_loader"=..\blender\loader\BLO_loader.dsp - Package Owner=<4> Package=<5> {{{ @@ -99,7 +99,7 @@ Package=<4> ############################################################################### -Project: "BLO_readblenfile"="..\BLENDER\BLO_readblenfile\BLO_readblenfile.dsp" - Package Owner=<4> +Project: "BLO_readblenfile"=..\BLENDER\BLO_readblenfile\BLO_readblenfile.dsp - Package Owner=<4> Package=<5> {{{ @@ -111,7 +111,7 @@ Package=<4> ############################################################################### -Project: "BLO_readstreamglue"="..\BLENDER\BLO_readstreamglue\BLO_readstreamglue.dsp" - Package Owner=<4> +Project: "BLO_readstreamglue"=..\BLENDER\BLO_readstreamglue\BLO_readstreamglue.dsp - Package Owner=<4> Package=<5> {{{ @@ -123,7 +123,7 @@ Package=<4> ############################################################################### -Project: "BLO_sign"="..\BLENDER\BLO_sign\BLO_sign.dsp" - Package Owner=<4> +Project: "BLO_sign"=..\BLENDER\BLO_sign\BLO_sign.dsp - Package Owner=<4> Package=<5> {{{ @@ -135,7 +135,7 @@ Package=<4> ############################################################################### -Project: "BLO_verify"="..\BLENDER\BLO_verify\BLO_verify.dsp" - Package Owner=<4> +Project: "BLO_verify"=..\BLENDER\BLO_verify\BLO_verify.dsp - Package Owner=<4> Package=<5> {{{ @@ -147,7 +147,7 @@ Package=<4> ############################################################################### -Project: "BLO_writeblenfile"="..\BLENDER\BLO_writeblenfile\BLO_writeblenfile.dsp" - Package Owner=<4> +Project: "BLO_writeblenfile"=..\BLENDER\BLO_writeblenfile\BLO_writeblenfile.dsp - Package Owner=<4> Package=<5> {{{ @@ -159,7 +159,7 @@ Package=<4> ############################################################################### -Project: "BLO_writestreamglue"="..\BLENDER\BLO_writestreamglue\BLO_writestreamglue.dsp" - Package Owner=<4> +Project: "BLO_writestreamglue"=..\BLENDER\BLO_writestreamglue\BLO_writestreamglue.dsp - Package Owner=<4> Package=<5> {{{ @@ -171,7 +171,7 @@ Package=<4> ############################################################################### -Project: "BLO_writestreamglue_stub"="..\blender\BLO_writestreamglue_stub\BLO_writestreamglue_stub.dsp" - Package Owner=<4> +Project: "BLO_writestreamglue_stub"=..\blender\BLO_writestreamglue_stub\BLO_writestreamglue_stub.dsp - Package Owner=<4> Package=<5> {{{ @@ -183,7 +183,7 @@ Package=<4> ############################################################################### -Project: "BL_avi"="..\blender\avi\BL_avi.dsp" - Package Owner=<4> +Project: "BL_avi"=..\blender\avi\BL_avi.dsp - Package Owner=<4> Package=<5> {{{ @@ -195,7 +195,7 @@ Package=<4> ############################################################################### -Project: "BL_imbuf"="..\blender\imbuf\BL_imbuf.dsp" - Package Owner=<4> +Project: "BL_imbuf"=..\blender\imbuf\BL_imbuf.dsp - Package Owner=<4> Package=<5> {{{ @@ -207,7 +207,7 @@ Package=<4> ############################################################################### -Project: "BL_img"="..\blender\img\BL_img.dsp" - Package Owner=<4> +Project: "BL_img"=..\blender\img\BL_img.dsp - Package Owner=<4> Package=<5> {{{ @@ -219,7 +219,7 @@ Package=<4> ############################################################################### -Project: "BL_misc"="..\blender\misc\BL_misc.dsp" - Package Owner=<4> +Project: "BL_misc"=..\blender\misc\BL_misc.dsp - Package Owner=<4> Package=<5> {{{ @@ -231,7 +231,7 @@ Package=<4> ############################################################################### -Project: "BL_src"="..\blender\src\BL_src.dsp" - Package Owner=<4> +Project: "BL_src"=..\blender\src\BL_src.dsp - Package Owner=<4> Package=<5> {{{ @@ -243,7 +243,7 @@ Package=<4> ############################################################################### -Project: "BL_src_cre"="..\blender\src\BL_src_cre.dsp" - Package Owner=<4> +Project: "BL_src_cre"=..\blender\src\BL_src_cre.dsp - Package Owner=<4> Package=<5> {{{ @@ -255,7 +255,7 @@ Package=<4> ############################################################################### -Project: "BL_src_pub"="..\blender\src\BL_src_pub.dsp" - Package Owner=<4> +Project: "BL_src_pub"=..\blender\src\BL_src_pub.dsp - Package Owner=<4> Package=<5> {{{ @@ -267,7 +267,7 @@ Package=<4> ############################################################################### -Project: "BPY_frozen"="..\blender\bpython\frozen\BPY_frozen.dsp" - Package Owner=<4> +Project: "BPY_frozen"=..\blender\bpython\frozen\BPY_frozen.dsp - Package Owner=<4> Package=<5> {{{ @@ -279,7 +279,7 @@ Package=<4> ############################################################################### -Project: "BPY_python"="..\blender\bpython\intern\BPY_python\BPY_python.dsp" - Package Owner=<4> +Project: "BPY_python"=..\blender\bpython\intern\BPY_python\BPY_python.dsp - Package Owner=<4> Package=<5> {{{ @@ -291,7 +291,7 @@ Package=<4> ############################################################################### -Project: "BRA_radiosity"="..\blender\radiosity\BRA_radiosity.dsp" - Package Owner=<4> +Project: "BRA_radiosity"=..\blender\radiosity\BRA_radiosity.dsp - Package Owner=<4> Package=<5> {{{ @@ -303,7 +303,7 @@ Package=<4> ############################################################################### -Project: "BRE_render"="..\blender\render\BRE_render.dsp" - Package Owner=<4> +Project: "BRE_render"=..\blender\render\BRE_render.dsp - Package Owner=<4> Package=<5> {{{ @@ -315,7 +315,7 @@ Package=<4> ############################################################################### -Project: "BRE_renderconverter"="..\blender\renderconverter\BRE_renderconverter.dsp" - Package Owner=<4> +Project: "BRE_renderconverter"=..\blender\renderconverter\BRE_renderconverter.dsp - Package Owner=<4> Package=<5> {{{ @@ -327,7 +327,7 @@ Package=<4> ############################################################################### -Project: "BRE_renderui"="..\blender\renderui\BRE_renderui.dsp" - Package Owner=<4> +Project: "BRE_renderui"=..\blender\renderui\BRE_renderui.dsp - Package Owner=<4> Package=<5> {{{ @@ -339,7 +339,7 @@ Package=<4> ############################################################################### -Project: "DNA_makesdna"="..\blender\makesdna\DNA_makesdna.dsp" - Package Owner=<4> +Project: "DNA_makesdna"=..\blender\makesdna\DNA_makesdna.dsp - Package Owner=<4> Package=<5> {{{ @@ -351,7 +351,7 @@ Package=<4> ############################################################################### -Project: "EXP_expressions"="..\gameengine\expression\EXP_expressions.dsp" - Package Owner=<4> +Project: "EXP_expressions"=..\gameengine\expression\EXP_expressions.dsp - Package Owner=<4> Package=<5> {{{ @@ -363,7 +363,7 @@ Package=<4> ############################################################################### -Project: "GP_axctl"="..\gameengine\gameplayer\axctl\GP_axctl.dsp" - Package Owner=<4> +Project: "GP_axctl"=..\gameengine\gameplayer\axctl\GP_axctl.dsp - Package Owner=<4> Package=<5> {{{ @@ -456,16 +456,16 @@ Package=<4> Project_Dep_Name SND_fmod End Project Dependency Begin Project Dependency - Project_Dep_Name PHY_Dummy + Project_Dep_Name PHY_Physics End Project Dependency Begin Project Dependency - Project_Dep_Name PHY_Physics + Project_Dep_Name PHY_Ode End Project Dependency }}} ############################################################################### -Project: "GP_common"="..\gameengine\gameplayer\common\GP_common.dsp" - Package Owner=<4> +Project: "GP_common"=..\gameengine\gameplayer\common\GP_common.dsp - Package Owner=<4> Package=<5> {{{ @@ -477,7 +477,7 @@ Package=<4> ############################################################################### -Project: "GP_ghost"="..\gameengine\gameplayer\ghost\GP_ghost.dsp" - Package Owner=<4> +Project: "GP_ghost"=..\gameengine\gameplayer\ghost\GP_ghost.dsp - Package Owner=<4> Package=<5> {{{ @@ -582,7 +582,7 @@ Package=<4> ############################################################################### -Project: "KX_blenderhook"="..\gameengine\blenderhook\KX_blenderhook.dsp" - Package Owner=<4> +Project: "KX_blenderhook"=..\gameengine\blenderhook\KX_blenderhook.dsp - Package Owner=<4> Package=<5> {{{ @@ -594,7 +594,7 @@ Package=<4> ############################################################################### -Project: "KX_converter"="..\gameengine\converter\KX_converter.dsp" - Package Owner=<4> +Project: "KX_converter"=..\gameengine\converter\KX_converter.dsp - Package Owner=<4> Package=<5> {{{ @@ -606,7 +606,7 @@ Package=<4> ############################################################################### -Project: "KX_ketsji"="..\gameengine\ketsji\KX_ketsji.dsp" - Package Owner=<4> +Project: "KX_ketsji"=..\gameengine\ketsji\KX_ketsji.dsp - Package Owner=<4> Package=<5> {{{ @@ -618,7 +618,7 @@ Package=<4> ############################################################################### -Project: "KX_network"="..\gameengine\ketsji\network\KX_network.dsp" - Package Owner=<4> +Project: "KX_network"=..\gameengine\ketsji\network\KX_network.dsp - Package Owner=<4> Package=<5> {{{ @@ -630,7 +630,7 @@ Package=<4> ############################################################################### -Project: "NG_loopbacknetwork"="..\gameengine\network\loopbacknetwork\NG_loopbacknetwork.dsp" - Package Owner=<4> +Project: "NG_loopbacknetwork"=..\gameengine\network\loopbacknetwork\NG_loopbacknetwork.dsp - Package Owner=<4> Package=<5> {{{ @@ -642,7 +642,7 @@ Package=<4> ############################################################################### -Project: "NG_network"="..\gameengine\network\network\NG_network.dsp" - Package Owner=<4> +Project: "NG_network"=..\gameengine\network\network\NG_network.dsp - Package Owner=<4> Package=<5> {{{ @@ -654,7 +654,7 @@ Package=<4> ############################################################################### -Project: "PHY_Dummy"="..\GAMEENGINE\PHYSICS\PHY_PHYSICS\PHY_Dummy\PHY_Dummy.dsp" - Package Owner=<4> +Project: "PHY_Dummy"=..\GAMEENGINE\PHYSICS\PHY_PHYSICS\PHY_Dummy\PHY_Dummy.dsp - Package Owner=<4> Package=<5> {{{ @@ -666,7 +666,7 @@ Package=<4> ############################################################################### -Project: "PHY_Ode"="..\gameengine\physics\PHY_Physics\PHY_Ode\PHY_Ode.dsp" - Package Owner=<4> +Project: "PHY_Ode"=..\gameengine\physics\PHY_Physics\PHY_Ode\PHY_Ode.dsp - Package Owner=<4> Package=<5> {{{ @@ -678,7 +678,7 @@ Package=<4> ############################################################################### -Project: "PHY_Physics"="..\gameengine\physics\PHY_Physics\PHY_Physics.dsp" - Package Owner=<4> +Project: "PHY_Physics"=..\gameengine\physics\PHY_Physics\PHY_Physics.dsp - Package Owner=<4> Package=<5> {{{ @@ -690,7 +690,7 @@ Package=<4> ############################################################################### -Project: "RAS_openglrasterizer"="..\gameengine\rasterizer\openglrasterizer\RAS_openglrasterizer.dsp" - Package Owner=<4> +Project: "RAS_openglrasterizer"=..\gameengine\rasterizer\openglrasterizer\RAS_openglrasterizer.dsp - Package Owner=<4> Package=<5> {{{ @@ -702,7 +702,7 @@ Package=<4> ############################################################################### -Project: "RAS_rasterizer"="..\gameengine\rasterizer\RAS_rasterizer.dsp" - Package Owner=<4> +Project: "RAS_rasterizer"=..\gameengine\rasterizer\RAS_rasterizer.dsp - Package Owner=<4> Package=<5> {{{ @@ -714,7 +714,7 @@ Package=<4> ############################################################################### -Project: "SCA_GameLogic"="..\gameengine\gamelogic\SCA_GameLogic.dsp" - Package Owner=<4> +Project: "SCA_GameLogic"=..\gameengine\gamelogic\SCA_GameLogic.dsp - Package Owner=<4> Package=<5> {{{ @@ -726,7 +726,7 @@ Package=<4> ############################################################################### -Project: "SG_SceneGraph"="..\gameengine\scenegraph\SG_SceneGraph.dsp" - Package Owner=<4> +Project: "SG_SceneGraph"=..\gameengine\scenegraph\SG_SceneGraph.dsp - Package Owner=<4> Package=<5> {{{ @@ -738,7 +738,7 @@ Package=<4> ############################################################################### -Project: "SM_solid"="..\sumo\solid\SM_solid.dsp" - Package Owner=<4> +Project: "SM_solid"=..\sumo\solid\SM_solid.dsp - Package Owner=<4> Package=<5> {{{ @@ -750,7 +750,7 @@ Package=<4> ############################################################################### -Project: "SND_Dummy"="..\gameengine\sound\dummy\SND_Dummy.dsp" - Package Owner=<4> +Project: "SND_Dummy"=..\gameengine\sound\dummy\SND_Dummy.dsp - Package Owner=<4> Package=<5> {{{ @@ -762,7 +762,7 @@ Package=<4> ############################################################################### -Project: "SND_fmod"="..\gameengine\sound\fmod\SND_fmod.dsp" - Package Owner=<4> +Project: "SND_fmod"=..\gameengine\sound\fmod\SND_fmod.dsp - Package Owner=<4> Package=<5> {{{ @@ -774,7 +774,7 @@ Package=<4> ############################################################################### -Project: "SND_openal"="..\gameengine\sound\openal\SND_openal.dsp" - Package Owner=<4> +Project: "SND_openal"=..\gameengine\sound\openal\SND_openal.dsp - Package Owner=<4> Package=<5> {{{ @@ -786,7 +786,7 @@ Package=<4> ############################################################################### -Project: "SND_sound"="..\gameengine\sound\SND_sound.dsp" - Package Owner=<4> +Project: "SND_sound"=..\gameengine\sound\SND_sound.dsp - Package Owner=<4> Package=<5> {{{ @@ -798,7 +798,7 @@ Package=<4> ############################################################################### -Project: "SYS_system"="..\kernel\system\SYS_system.dsp" - Package Owner=<4> +Project: "SYS_system"=..\kernel\system\SYS_system.dsp - Package Owner=<4> Package=<5> {{{ @@ -810,7 +810,7 @@ Package=<4> ############################################################################### -Project: "blendercreator"=".\blendercreator.dsp" - Package Owner=<4> +Project: "blendercreator"=.\blendercreator.dsp - Package Owner=<4> Package=<5> {{{ @@ -957,7 +957,7 @@ Package=<4> ############################################################################### -Project: "blenderpublisher"="..\blenderpublisher\blenderpublisher.dsp" - Package Owner=<4> +Project: "blenderpublisher"=..\blenderpublisher\blenderpublisher.dsp - Package Owner=<4> Package=<5> {{{ @@ -1100,11 +1100,14 @@ Package=<4> Begin Project Dependency Project_Dep_Name BPY_frozen End Project Dependency + Begin Project Dependency + Project_Dep_Name PHY_Ode + End Project Dependency }}} ############################################################################### -Project: "blenpluginapi"="..\blender\blenpluginapi\blenpluginapi\blenpluginapi.dsp" - Package Owner=<4> +Project: "blenpluginapi"=..\blender\blenpluginapi\blenpluginapi\blenpluginapi.dsp - Package Owner=<4> Package=<5> {{{ @@ -1116,7 +1119,7 @@ Package=<4> ############################################################################### -Project: "gen_messaging"="..\KERNEL\gen_messaging\gen_messaging.dsp" - Package Owner=<4> +Project: "gen_messaging"=..\KERNEL\gen_messaging\gen_messaging.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp b/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp index 6e0fa976a0a..0cb07f6836f 100644 --- a/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp +++ b/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp @@ -58,7 +58,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 opengl32.lib glu32.lib glaux.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/ActiveXgp.ocx" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\lib\windows\openal\lib\lib_release" # SUBTRACT BASE LINK32 /nodefaultlib -# ADD LINK32 fmodvc.lib libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.a libeay32.lib libz.a libpng.a libjpeg-static.a /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /out:"..\..\..\..\obj\windows\debug\Blender3DPlugin.ocx" /pdbtype:sept /libpath:"../../../../lib/windows/fmod/lib" /libpath:"../../../../lib/windows/guardedalloc/lib" /libpath:"../../../../lib/windows/moto/lib" /libpath:"../../../../lib/windows/bmfont/lib" /libpath:"../../../../lib/windows/string/lib" /libpath:"../../../../lib/windows/python/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib\mt_dll" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib" /libpath:"..\..\..\..\lib\windows\jpeg\lib" +# ADD LINK32 fmodvc.lib libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.a libeay32.lib libz.a libpng.a libjpeg-static.a odelib.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /out:"..\..\..\..\obj\windows\debug\Blender3DPlugin.ocx" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\ode\lib" /libpath:"../../../../lib/windows/fmod/lib" /libpath:"../../../../lib/windows/guardedalloc/lib" /libpath:"../../../../lib/windows/moto/lib" /libpath:"../../../../lib/windows/bmfont/lib" /libpath:"../../../../lib/windows/string/lib" /libpath:"../../../../lib/windows/python/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib\mt_dll" /libpath:"..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\lib\windows\fmod\lib" /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\..\lib\windows\bmfont/lib" /libpath:"..\..\..\..\lib\windows\string\lib" /libpath:"..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\lib\windows\openssl\lib\\" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "GP_axctl - Win32 MT DLL Release" @@ -88,7 +88,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 opengl32.lib glu32.lib glaux.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/ActiveXgp.ocx" -# ADD LINK32 fmodvc.lib libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.a libeay32.lib libz.a libpng.a libjpeg-static.a /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrtd.lib" /out:"..\..\..\..\obj\windows\Blender3DPlugin.ocx" /libpath:"../../../../lib/windows/jpeg/lib" /libpath:"../../../../lib/windows/fmod/lib" /libpath:"../../../../lib/windows/guardedalloc/lib" /libpath:"../../../../lib/windows/moto/lib" /libpath:"../../../../lib/windows/bmfont/lib" /libpath:"../../../../lib/windows/string/lib" /libpath:"../../../../lib/windows/python/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib\mt_dll" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib" +# ADD LINK32 fmodvc.lib libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libblenkey.a libeay32.lib libz.a libpng.a libjpeg-static.a odelib.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\obj\windows\Blender3DPlugin.ocx" /libpath:"..\..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\..\lib\windows\fmod\lib" /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\lib\windows\moto\lib" /libpath:"..\..\..\..\lib\windows\bmfont/lib" /libpath:"..\..\..\..\lib\windows\string\lib" /libpath:"..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\lib\windows\openssl\lib\\" /libpath:"..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib" !ENDIF diff --git a/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp b/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp index a6132c2199d..9c80b67b9b9 100644 --- a/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp +++ b/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\ghost\include" /I "../../../../lib/windows/iksolver/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\ode\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\ghost\include" /I "..\..\..\..\lib\windows\iksolver\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\ghost\include" /I "../../../../lib/windows/iksolver/include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /U "_DEBUG" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\ghost\include" /I "../../../../lib/windows/iksolver/include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "dSINGLE" /U "_DEBUG" /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -75,7 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libguardedalloc.a libstring.a libghost.a odelib.lib fmodvc.lib libbmfont.a ws2_32.lib kernel32.lib user32.lib gdi32.lib vfw32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg-static.a dxguid.lib libblenkey.a libeay32.lib libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\..\..\obj\windows\debug\blenderplayer.exe" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\lib\windows\string\lib\\" /libpath:"..\..\..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\lib\windows\moto\lib\\" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\..\lib\windows\ode-0.03\lib" /libpath:"../../../../lib/windows/fmod/lib" /libpath:"..\..\..\..\lib\windows\python\lib" /libpath:"../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" +# ADD LINK32 libguardedalloc.a libstring.a libghost.a odelib.lib fmodvc.lib libbmfont.a ws2_32.lib kernel32.lib user32.lib gdi32.lib vfw32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg-static.a dxguid.lib libblenkey.a libeay32.lib libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\..\..\obj\windows\debug\blenderplayer.exe" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\ode\lib" /libpath:"..\..\..\..\lib\windows\bmfont\lib\\" /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\lib\windows\string\lib\\" /libpath:"..\..\..\..\lib\windows\ghost\lib\\" /libpath:"..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\lib\windows\moto\lib\\" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\..\lib\windows\ode-0.03\lib" /libpath:"../../../../lib/windows/fmod/lib" /libpath:"..\..\..\..\lib\windows\python\lib" /libpath:"../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/projectfiles/gameengine/ketsji/KX_ketsji.dsp b/projectfiles/gameengine/ketsji/KX_ketsji.dsp index 9ab6d9b2251..57adb0f11df 100644 --- a/projectfiles/gameengine/ketsji/KX_ketsji.dsp +++ b/projectfiles/gameengine/ketsji/KX_ketsji.dsp @@ -68,7 +68,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "JANCODEPANCO" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "JANCODEPANCO" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /D "dSINGLE" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -303,10 +303,6 @@ SOURCE=..\..\..\source\gameengine\Ketsji\KX_MotionState.cpp # End Source File # Begin Source File -SOURCE=..\..\..\source\gameengine\Ketsji\KX_MotionState.h -# End Source File -# Begin Source File - SOURCE=..\..\..\source\gameengine\Ketsji\KX_OdePhysicsController.cpp # End Source File # Begin Source File @@ -551,6 +547,10 @@ SOURCE=..\..\..\source\gameengine\Ketsji\KX_MeshProxy.h # End Source File # Begin Source File +SOURCE=..\..\..\source\gameengine\Ketsji\KX_MotionState.h +# End Source File +# Begin Source File + SOURCE=..\..\..\source\gameengine\Ketsji\KX_OdePhysicsController.h # End Source File # Begin Source File diff --git a/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp b/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp index f3f6a1aeb61..db74b0d8f46 100644 --- a/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp +++ b/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=PHY_Ode - Win32 Debug +CFG=PHY_Ode - Win32 MT DLL Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,14 @@ CFG=PHY_Ode - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "PHY_Ode.mak" CFG="PHY_Ode - Win32 Debug" +!MESSAGE NMAKE /f "PHY_Ode.mak" CFG="PHY_Ode - Win32 MT DLL Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "PHY_Ode - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "PHY_Ode - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "PHY_Ode - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") +!MESSAGE "PHY_Ode - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -42,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../../../../source/ode/include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "../../../../../source/ode/include" /I "..\..\..\..\..\lib\windows\ode\include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +68,55 @@ LIB32=link.exe -lib # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../source/ode/include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/ode/include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "PHY_Ode - Win32 MT DLL Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "PHY_Ode___Win32_MT_DLL_Release" +# PROP BASE Intermediate_Dir "PHY_Ode___Win32_MT_DLL_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll" +# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll" +# PROP Target_Dir "" +LINK32=link.exe -lib +# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../../../../source/ode/include" /I "..\..\..\..\..\lib\windows\ode\include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../../source/ode/include" /I "..\..\..\..\..\lib\windows\ode\include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "PHY_Ode - Win32 MT DLL Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "PHY_Ode___Win32_MT_DLL_Debug" +# PROP BASE Intermediate_Dir "PHY_Ode___Win32_MT_DLL_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\physics\ode\mtdll_debug" +# PROP Target_Dir "" +LINK32=link.exe -lib +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/ode/include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/ode/include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "dSINGLE" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -82,6 +132,8 @@ LIB32=link.exe -lib # Name "PHY_Ode - Win32 Release" # Name "PHY_Ode - Win32 Debug" +# Name "PHY_Ode - Win32 MT DLL Release" +# Name "PHY_Ode - Win32 MT DLL Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" |