From 61767b4f483613f4060524abd9cb7e74aae355ea Mon Sep 17 00:00:00 2001 From: Joseph Gilbert Date: Sun, 20 Feb 2005 21:33:11 +0000 Subject: MSVC7 update and freetype2 source - Added correct .libs to be linked to GP_Ghost - Fixed incorrect library extensions for the linker (*.lib and not unix *.a) - Projects have been set to be multi-threaded - projects were being linked to different versions of the CRT - All projects are now linking to python 2.3 (this fixes an error regarding struct sizes in python) - Removed invalid source paths from inclusion for the compiler - Fix dependency issues with the GP_Ghost module - Proper .dll's are now being copied to their respective locations for debug and release version of blender/blenderplayer - Warnings have been set to level 2 - Import paths have been updated and organized for the compiler - Duplicate import paths for the compiler have been removed - Removed silly silly silly silly unix path-separators from window paths - Post-Build scripts have been updated where neccessary (XCOPY is retatined) - Fixed the output of various .lib files (PHY_Sumo and Yafray) - PHY_Sumo now uses a .pch - Removed #undef _DEBUG from debug builds :p - FTF_Font is now contains a debug build and is being set to it's correct output path - Blender/Blenderplayer/3DPlugin all linkto Debug libs where appropriate (instead of static release libs to avoid conflicts with the CRT) - Python23_d.dll is now loaded into a true debug output of both blenderplayer and blender debug builds - msvcrtd.dll is now loaded into a true debug output of both blenderplayer and blender debug builds - Post-builds now clean up their mess - ActiveX controller now builds - BlenderPlayer now builds - Internal libs now using .pch - Moved the build directory from /blender/obj to ../build/msvc_7/ to follow precedence with scons builds - Builds are now organized to follow precedence with scons builds with a /libs and a /intern /extern /source obj folders - Set the proper build path for opennl - Forcing BLO_loader source files to follow project defaults - Added an 'extern' project that mimics the /make build of the 'intern' project - Extern build includes solid and it's associated builds, ftgl, and freetype - Added .vcproj files to /extern directory - Added new extern.sln file to /extern directory - All project now link to the built solid.lib from the extern project instead of lib/windows - Removed uneeded XCOPYs commands from post-builds - Added conditional Directory building to post-builds - Freetype2 source commit (this is need for the building of a correct MFC linked version of the activeX controller as well as a correct release and debug build of the blender project) - Ftgl is built and linked by the 'extern' project - Intern/Extern project are now exporting their proper header files - PHY_Physics is now linking to the correct set of header files (in build path not source) - Makesdna builds object files into build directory now - Projects are now ignoring the CORRECT versions of the CRT's :) - Renderconverter is now outputting it's obj file to it's own directory instead of /render - Gen_system is now being built to ../kernel - BL_src_cre is now being built to /creator - *.exp and *.ilk are now being cleaned up from linkers - Libpng.dll and zlib.dll are now being copied to the /bin - MTDLL build are now available for the correct projects - ActiveX 3D Plugin now links correctly to solid and freetype2 - Corrected the Preprocessor #define that was labeled incorrectly in FTF_Font and Blender that was causing the FTGL libs to export dll calling conventions. - Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for internal and external librarys - Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for blender and added 2 new solutions configurations BlenderPlayer Release, Debug - --- .../gameengine/blenderhook/KX_blenderhook.vcproj | 62 +++-- .../gameengine/converter/KX_converter.vcproj | 227 ++++++++++++++---- .../gameengine/expression/EXP_expressions.vcproj | 235 +++++++++++++----- .../gameengine/gamelogic/SCA_GameLogic.vcproj | 262 ++++++++++++++++----- .../gameengine/gameplayer/axctl/GP_axctl.vcproj | 144 ++++++----- .../gameengine/gameplayer/common/GP_common.vcproj | 129 ++++++---- .../gameengine/gameplayer/ghost/GP_ghost.vcproj | 157 +++++++----- .../gameengine/ketsji/KX_ketsji.vcproj | 253 +++++++++++++++----- .../gameengine/ketsji/network/KX_network.vcproj | 223 ++++++++++++++---- .../loopbacknetwork/NG_loopbacknetwork.vcproj | 213 +++++++++++++---- .../gameengine/network/network/NG_network.vcproj | 213 +++++++++++++---- .../physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj | 221 +++++++++++++---- .../physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj | 138 ++++++----- .../physics/PHY_Physics/PHY_Physics.vcproj | 223 ++++++++++++++---- .../physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj | 254 ++++++++++++++++++-- .../gameengine/rasterizer/RAS_rasterizer.vcproj | 217 +++++++++++++---- .../openglrasterizer/RAS_openglrasterizer.vcproj | 213 +++++++++++++---- .../gameengine/scenegraph/SG_SceneGraph.vcproj | 213 +++++++++++++---- 18 files changed, 2772 insertions(+), 825 deletions(-) (limited to 'projectfiles_vc7/gameengine') diff --git a/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj b/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj index 10da5ed91cf..db7da8a89bd 100644 --- a/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj +++ b/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj @@ -1,7 +1,7 @@ - + @@ -11,9 +11,9 @@ + CompileAs="0"/> @@ -56,11 +55,17 @@ Culture="1033"/> + + + @@ -104,8 +109,15 @@ Culture="1033"/> + + + + + @@ -11,9 +11,9 @@ + DebugInformationFormat="3" + CompileAs="0"/> @@ -55,11 +55,17 @@ Culture="1033"/> + + + @@ -102,11 +108,17 @@ Culture="1033"/> + + + + CompileAs="0"/> @@ -149,11 +160,17 @@ Culture="1033"/> + + + @@ -194,8 +213,120 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11,9 +11,9 @@ + CompileAs="0"/> @@ -56,11 +55,17 @@ Culture="1033"/> + + + + DebugInformationFormat="3" + CompileAs="0"/> @@ -102,11 +107,17 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + @@ -147,11 +211,69 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + @@ -193,8 +315,15 @@ Culture="1033"/> + + + + - - + + @@ -266,15 +395,15 @@ - - + + diff --git a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj index ca43624723b..cebaacf308d 100644 --- a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj +++ b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj @@ -1,7 +1,7 @@ - + @@ -11,9 +11,9 @@ + CompileAs="0"/> @@ -56,11 +55,17 @@ Culture="1033"/> + + + @@ -102,11 +107,17 @@ Culture="1033"/> + + + @@ -147,11 +159,17 @@ Culture="1033"/> + + + + DebugInformationFormat="3" + CompileAs="0"/> @@ -193,21 +211,132 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -235,6 +364,18 @@ + + + + + + + + @@ -284,15 +425,15 @@ - - + + @@ -320,6 +461,21 @@ + + + + + + + + + + diff --git a/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj b/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj index 832db61c7b1..fee59619140 100644 --- a/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj +++ b/projectfiles_vc7/gameengine/gameplayer/axctl/GP_axctl.vcproj @@ -1,8 +1,9 @@ - + @@ -12,55 +13,69 @@ + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0"/> + ImportLibrary="..\..\..\..\..\build\msvc_7\libs\debug\Blender3DPlugin.lib"/> + GenerateTypeLibrary="TRUE" + TypeLibraryName="BlenderPlayer.tlb" + OutputDirectory="..\..\..\..\source\gameengine\GamePlayer\ActiveX"/> + Name="VCPostBuildEventTool" + CommandLine="ECHO Moving temporary files +MOVE /Y ..\..\..\..\bin\debug\Blender3DPlugin.ilk ..\..\..\..\..\build\msvc_7\libs\debug +ECHO Done +"/> + Culture="1033" + AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\source\gameengine\gameplayer\axctl\mtdll_debug" + IgnoreStandardIncludePath="FALSE" + ShowProgress="FALSE"/> + + + + ImportLibrary="..\..\..\..\..\build\msvc_7\libs\Blender3DPlugin.lib"/> + TypeLibraryName="BlenderPlayer.tlb" + OutputDirectory="..\..\..\..\source\gameengine\GamePlayer\ActiveX"/> + + + + + Name="3D Plugin Debug|Win32"> + Name="3D Plugin Release|Win32"> + Name="3D Plugin Debug|Win32"> + Name="3D Plugin Release|Win32"> @@ -191,6 +224,9 @@ + + @@ -203,9 +239,6 @@ - - @@ -240,6 +273,9 @@ + + - - - - @@ -281,6 +311,12 @@ + + + + diff --git a/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj b/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj index 2ea52107758..f5d95b46ddb 100644 --- a/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj +++ b/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj @@ -1,7 +1,7 @@ - + @@ -11,9 +11,9 @@ @@ -54,11 +55,17 @@ Culture="1033"/> + + + + CompileAs="0"/> @@ -100,11 +106,17 @@ Culture="1033"/> + + + + DebugInformationFormat="3" + CompileAs="0"/> @@ -145,11 +157,17 @@ Culture="1033"/> + + + @@ -191,12 +209,22 @@ Culture="1033"/> + + + + + + @@ -239,9 +267,6 @@ - - + @@ -11,139 +11,176 @@ + TypeLibraryName=".\..\..\..\..\obj\windows\debug/GP_ghost.tlb"/> + Name="VCPostBuildEventTool" + CommandLine="ECHO Moving libraries and export definitions... +MOVE /Y ..\..\..\..\bin\debug\blenderplayer.lib ..\..\..\..\..\build\msvc_7\libs\debug +MOVE /Y ..\..\..\..\bin\debug\blenderplayer.exp ..\..\..\..\..\build\msvc_7\libs\debug +MOVE /Y ..\..\..\..\bin\debug\blenderplayer.ilk ..\..\..\..\..\build\msvc_7\libs\debug +ECHO Copying required 3rd party dlls... +XCOPY /Y ..\..\..\..\..\lib\windows\python\lib\python23_d.dll ..\..\..\..\bin\debug +XCOPY /Y ..\..\..\..\..\lib\windows\sdl\lib\SDL.dll ..\..\..\..\bin\debug +XCOPY /Y ..\..\..\..\..\lib\windows\png\lib\libpng.dll ..\..\..\..\bin\debug +XCOPY /Y ..\..\..\..\..\lib\windows\zlib\lib\zlib.dll ..\..\..\..\bin\debug +XCOPY /Y ..\..\..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\..\..\bin\debug +ECHO Done +"/> + + + + CompileAs="0"/> + TypeLibraryName=".\..\..\..\..\obj\windows/GP_ghost.tlb"/> + Name="VCPostBuildEventTool" + CommandLine="ECHO Moving libraries and export definitions... +MOVE /Y ..\..\..\..\bin\blenderplayer.lib ..\..\..\..\..\build\msvc_7\libs +MOVE /Y ..\..\..\..\bin\blenderplayer.exp ..\..\..\..\..\build\msvc_7\libs +ECHO Copying required 3rd party dlls... +XCOPY /Y ..\..\..\..\..\lib\windows\python\lib\python23.dll ..\..\..\..\bin +XCOPY /Y ..\..\..\..\..\lib\windows\sdl\lib\SDL.dll ..\..\..\..\bin +XCOPY /Y ..\..\..\..\..\lib\windows\png\lib\libpng.dll ..\..\..\..\bin +XCOPY /Y ..\..\..\..\..\lib\windows\zlib\lib\zlib.dll ..\..\..\..\bin +ECHO Done +"/> + + + + + RelativePath="..\..\..\..\source\blender\makesdna\intern\dna.c"> + RelativePath="..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Application.cpp"> + RelativePath="..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_Canvas.cpp"> + RelativePath="..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_ghost.cpp"> + RelativePath="..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_KeyboardDevice.cpp"> + RelativePath="..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_System.cpp"> @@ -151,13 +188,13 @@ + Name="BlenderPlayer Debug|Win32"> + Name="BlenderPlayer Release|Win32"> diff --git a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj index 513cf80f154..7d095b7b779 100644 --- a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj +++ b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj @@ -1,7 +1,7 @@ - + @@ -11,9 +11,9 @@ @@ -54,11 +56,17 @@ Culture="1033"/> + + + + DebugInformationFormat="3" + CompileAs="0"/> @@ -100,11 +108,17 @@ Culture="1033"/> + + + + CompileAs="0"/> @@ -147,11 +160,17 @@ Culture="1033"/> + + + @@ -194,8 +213,120 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -249,10 +383,10 @@ RelativePath="..\..\..\source\gameengine\Ketsji\KX_RayEventManager.cpp"> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_Scene.cpp"> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_SG_NodeRelationships.cpp"> @@ -276,10 +410,10 @@ Name="ActuatorsImp" Filter=""> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_CameraActuator.cpp"> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_CDActuator.cpp"> @@ -389,10 +523,10 @@ RelativePath="..\..\..\source\gameengine\Ketsji\KX_GameObject.h"> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_IPhysicsController.h"> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_IPOTransform.h"> @@ -421,6 +555,9 @@ + + @@ -434,10 +571,10 @@ RelativePath="..\..\..\source\gameengine\Ketsji\KX_RayEventManager.h"> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_Scene.h"> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_SG_NodeRelationships.h"> @@ -461,10 +598,10 @@ Name="Actuators" Filter=""> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_CameraActuator.h"> + RelativePath="..\..\..\source\gameengine\Ketsji\KX_CDActuator.h"> diff --git a/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj b/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj index 7befa106f9d..e2636e128c4 100644 --- a/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj +++ b/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj @@ -1,7 +1,7 @@ - + @@ -11,9 +11,9 @@ @@ -55,11 +55,17 @@ Culture="1033"/> + + + + CompileAs="0"/> @@ -102,11 +107,17 @@ Culture="1033"/> + + + @@ -147,11 +159,17 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + DebugInformationFormat="3" + CompileAs="0"/> @@ -193,8 +263,67 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + @@ -11,9 +11,9 @@ @@ -54,11 +55,17 @@ Culture="1033"/> + + + @@ -100,11 +107,17 @@ Culture="1033"/> + + + @@ -130,7 +143,7 @@ Name="VCCustomBuildTool"/> @@ -146,11 +159,17 @@ Culture="1033"/> + + + @@ -191,8 +211,119 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11,9 +11,9 @@ @@ -54,11 +55,17 @@ Culture="1033"/> + + + @@ -99,11 +107,17 @@ Culture="1033"/> + + + @@ -145,11 +159,17 @@ Culture="1033"/> + + + @@ -175,7 +195,7 @@ Name="VCCustomBuildTool"/> @@ -191,8 +211,119 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11,9 +11,9 @@ @@ -54,11 +55,17 @@ Culture="1033"/> + + + @@ -99,11 +106,17 @@ Culture="1033"/> + + + @@ -144,11 +157,17 @@ Culture="1033"/> + + + @@ -190,8 +209,118 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11,9 +11,9 @@ @@ -54,11 +54,17 @@ Culture="1033"/> + + + @@ -100,36 +106,42 @@ Culture="1033"/> + + + @@ -141,40 +153,47 @@ Name="VCPreLinkEventTool"/> + + + @@ -186,12 +205,19 @@ Name="VCPreLinkEventTool"/> + + + + + @@ -11,9 +11,9 @@ @@ -54,11 +54,17 @@ Culture="1033"/> + + + @@ -100,11 +106,17 @@ Culture="1033"/> + + + @@ -145,11 +158,17 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + @@ -190,8 +260,67 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + @@ -11,28 +11,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DebugInformationFormat="3"/> + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\mtdll\PHY_Sumo.lib"/> + + + + + + + + + + + + + + + + + + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\PHY_Sumo.lib"/> + + + + + + + + + + + + + + + + + + + + diff --git a/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj b/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj index fce02e4c030..e62b8cb9b4e 100644 --- a/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj +++ b/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj @@ -1,7 +1,7 @@ - + @@ -11,9 +11,9 @@ @@ -39,7 +39,7 @@ Name="VCCustomBuildTool"/> @@ -55,11 +55,17 @@ Culture="1033"/> + + + @@ -100,11 +107,17 @@ Culture="1033"/> + + + @@ -146,11 +159,17 @@ Culture="1033"/> + + + @@ -191,8 +211,119 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RelativePath="..\..\..\source\gameengine\Rasterizer\RAS_texmatrix.cpp"> + RelativePath="..\..\..\source\gameengine\Rasterizer\RAS_TexVert.cpp"> + @@ -11,9 +11,9 @@ @@ -54,11 +55,17 @@ Culture="1033"/> + + + @@ -84,7 +91,7 @@ Name="VCCustomBuildTool"/> @@ -100,11 +107,17 @@ Culture="1033"/> + + + @@ -145,11 +159,17 @@ Culture="1033"/> + + + @@ -191,8 +211,119 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11,9 +11,9 @@ @@ -55,11 +55,17 @@ Culture="1033"/> + + + @@ -85,7 +91,7 @@ Name="VCCustomBuildTool"/> @@ -101,11 +107,17 @@ Culture="1033"/> + + + @@ -146,11 +159,17 @@ Culture="1033"/> + + + @@ -191,8 +211,119 @@ Culture="1033"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +