From f54a113cde2a405e5b432ebf1c3201110e288124 Mon Sep 17 00:00:00 2001 From: Joseph Gilbert Date: Mon, 17 Apr 2006 20:05:39 +0000 Subject: Update to the VC7 projectfiles. This should bring the projectfiles upto date for msvc7. Moving these to version 7.1 so that the version 8 people don't have such a hard time importing into 2005. Build intern.sln, extern.sln and then blender.sln. Enjoy. :p --- .../BLO_readblenfile/BLO_readblenfile.vcproj | 5 +- .../blender/BPY_python/BPY_python.vcproj | 17 +++- projectfiles_vc7/blender/avi/BL_avi.vcproj | 17 ++-- projectfiles_vc7/blender/blender.sln | 15 +--- projectfiles_vc7/blender/blender.vcproj | 22 +++-- .../blender/blenkernel/BKE_blenkernel.vcproj | 41 +++++++++- .../blender/blenlib/BLI_blenlib.vcproj | 35 ++++++-- .../blenpluginapi/blenpluginapi.vcproj | 5 +- projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj | 5 +- projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj | 95 ++++++++++++++++++++-- projectfiles_vc7/blender/img/BL_img.vcproj | 5 +- projectfiles_vc7/blender/loader/BLO_loader.vcproj | 5 +- .../blender/makesdna/DNA_makesdna.vcproj | 23 ++++-- .../blender/radiosity/BRA_radiosity.vcproj | 9 +- projectfiles_vc7/blender/render/BRE_render.vcproj | 70 ++++------------ .../renderconverter/BRE_renderconverter.vcproj | 11 +-- projectfiles_vc7/blender/src/BL_src.vcproj | 57 +++++++++++-- projectfiles_vc7/blender/src/BL_src_cre.vcproj | 5 +- projectfiles_vc7/blender/yafray/BRE_yafray.vcproj | 5 +- .../gameengine/blenderhook/KX_blenderhook.vcproj | 5 +- .../gameengine/converter/KX_converter.vcproj | 5 +- .../gameengine/expression/EXP_expressions.vcproj | 5 +- .../gameengine/gamelogic/SCA_GameLogic.vcproj | 5 +- .../gameengine/gameplayer/axctl/GP_axctl.vcproj | 5 +- .../gameengine/gameplayer/common/GP_common.vcproj | 5 +- .../gameengine/gameplayer/ghost/GP_ghost.vcproj | 5 +- .../gameengine/ketsji/KX_ketsji.vcproj | 53 ++++++++++-- .../gameengine/ketsji/network/KX_network.vcproj | 5 +- .../loopbacknetwork/NG_loopbacknetwork.vcproj | 5 +- .../gameengine/network/network/NG_network.vcproj | 5 +- .../PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj | 5 +- .../physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj | 5 +- .../physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj | 5 +- .../physics/PHY_Physics/PHY_Physics.vcproj | 11 ++- .../physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj | 5 +- .../gameengine/rasterizer/RAS_rasterizer.vcproj | 5 +- .../openglrasterizer/RAS_openglrasterizer.vcproj | 17 +++- .../gameengine/scenegraph/SG_SceneGraph.vcproj | 5 +- .../kernel/gen_messaging/gen_messaging.vcproj | 5 +- projectfiles_vc7/kernel/system/SYS_system.vcproj | 5 +- 40 files changed, 426 insertions(+), 192 deletions(-) (limited to 'projectfiles_vc7') diff --git a/projectfiles_vc7/blender/BLO_readblenfile/BLO_readblenfile.vcproj b/projectfiles_vc7/blender/BLO_readblenfile/BLO_readblenfile.vcproj index 140f4a079b0..3618ac56296 100644 --- a/projectfiles_vc7/blender/BLO_readblenfile/BLO_readblenfile.vcproj +++ b/projectfiles_vc7/blender/BLO_readblenfile/BLO_readblenfile.vcproj @@ -1,7 +1,7 @@ @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -119,7 +119,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + + + @@ -190,6 +194,9 @@ + + @@ -321,6 +328,9 @@ + + @@ -357,6 +367,9 @@ + + diff --git a/projectfiles_vc7/blender/avi/BL_avi.vcproj b/projectfiles_vc7/blender/avi/BL_avi.vcproj index 023a05a9b04..302586b1dc3 100644 --- a/projectfiles_vc7/blender/avi/BL_avi.vcproj +++ b/projectfiles_vc7/blender/avi/BL_avi.vcproj @@ -1,7 +1,7 @@ @@ -21,7 +21,7 @@ - + + @@ -98,7 +100,7 @@ ECHO Done Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\source\blender;..\..\source\blender\imbuf;..\..\source\blender\misc;..\..\source\blender\blenlib;..\..\source\blender\python;..\..\source\blender\include;..\..\source\blender\renderui;..\..\source\blender\makesdna;..\..\source\blender\blenkernel;..\..\source\blender\blenloader;..\..\source\blender\renderconverter;..\..\source\blender\render\extern\include;..\..\source\blender\radiosity\extern\include;..\..\source\kernel\gen_system;..\..\source\kernel\gen_messaging" - PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE,WITH_QUICKTIME" + PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;WITH_QUICKTIME" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="2" @@ -116,12 +118,12 @@ ECHO Done Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 " - AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24_d.lib libelbeem.lib libboolop.lib" + AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib BulletDynamics.lib Bullet.lib python24_d.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib" ShowProgress="0" OutputFile="..\..\bin\debug\blender.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern\debug;..\..\..\build\msvc_7\libs\extern\debug" + AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern\debug;..\..\..\build\msvc_7\libs\extern\debug" IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcd.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="..\..\..\build\msvc_7\libs\debug\blender.pdb" @@ -140,6 +142,8 @@ XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin\debug XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin\debug XCOPY /Y ..\..\..\lib\windows\python\lib\python24_d.dll ..\..\bin\debug XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\bin\debug +XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin\debug +XCOPY /Y ..\..\..\lib\windows\pthreads\lib\*.dll ..\..\bin\debug ECHO Copying language folder IF NOT EXIST ..\..\bin\debug\.blender MKDIR ..\..\bin\debug\.blender XCOPY /Y ..\..\bin\.blender ..\..\bin\debug\.blender /E @@ -165,11 +169,15 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + + + diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj index 64883858730..eafdf011175 100644 --- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj +++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj @@ -1,7 +1,7 @@ @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + + + @@ -376,6 +380,9 @@ + + @@ -406,6 +413,15 @@ + + + + + + @@ -448,6 +464,12 @@ + + + + + + @@ -515,6 +540,9 @@ + + @@ -548,6 +576,9 @@ + + @@ -599,6 +630,12 @@ + + + + diff --git a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj index 8cc842596e7..f12cef1ffac 100644 --- a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj +++ b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj @@ -1,7 +1,7 @@ @@ -21,7 +21,7 @@ - + + + + @@ -363,6 +367,9 @@ + + @@ -384,6 +391,9 @@ + + @@ -421,6 +431,12 @@ + + + + @@ -436,6 +452,9 @@ + + diff --git a/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj b/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj index 3954552ebc1..dce7f9d7cc4 100644 --- a/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj +++ b/projectfiles_vc7/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj @@ -1,7 +1,7 @@ @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -115,7 +115,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -21,7 +21,7 @@ - + + + + @@ -384,6 +388,9 @@ + + @@ -411,16 +418,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -445,6 +512,9 @@ + + @@ -478,6 +548,9 @@ + + @@ -487,6 +560,12 @@ + + + + diff --git a/projectfiles_vc7/blender/img/BL_img.vcproj b/projectfiles_vc7/blender/img/BL_img.vcproj index 7dce5a5b383..cf94dbeed4f 100644 --- a/projectfiles_vc7/blender/img/BL_img.vcproj +++ b/projectfiles_vc7/blender/img/BL_img.vcproj @@ -1,7 +1,7 @@ @@ -211,7 +211,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -21,7 +21,7 @@ - + + + + @@ -497,6 +501,9 @@ DNA_makesdna.exe dna.c + + diff --git a/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj b/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj index 0548f01e734..8ef408c5a5d 100644 --- a/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj +++ b/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj @@ -1,7 +1,7 @@ @@ -21,7 +21,7 @@ - + + @@ -115,19 +115,20 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + + RelativePath="..\..\..\source\blender\render\intern\source\convertblender.c"> + RelativePath="..\..\..\source\blender\render\intern\source\edgeRender.c"> + RelativePath="..\..\..\source\blender\render\intern\source\envmap.c"> @@ -139,7 +140,7 @@ RelativePath="..\..\..\source\blender\render\intern\source\initrender.c"> + RelativePath="..\..\..\source\blender\render\intern\source\pipeline.c"> @@ -150,39 +151,21 @@ - - - - - - - - - - - - - - - - - - @@ -221,7 +195,13 @@ RelativePath="..\..\..\source\blender\render\intern\include\pixelshading.h"> + RelativePath="..\..\..\source\blender\render\extern\include\RE_pipeline.h"> + + + + @@ -230,10 +210,10 @@ RelativePath="..\..\..\source\blender\render\intern\include\rendercore_int.h"> + RelativePath="..\..\..\source\blender\render\intern\include\renderdatabase.h"> + RelativePath="..\..\..\source\blender\render\intern\include\renderpipeline.h"> @@ -241,33 +221,15 @@ - - - - - - - - - - - - diff --git a/projectfiles_vc7/blender/renderconverter/BRE_renderconverter.vcproj b/projectfiles_vc7/blender/renderconverter/BRE_renderconverter.vcproj index 3e21c0e5463..ef830fe5905 100644 --- a/projectfiles_vc7/blender/renderconverter/BRE_renderconverter.vcproj +++ b/projectfiles_vc7/blender/renderconverter/BRE_renderconverter.vcproj @@ -1,7 +1,7 @@ @@ -115,21 +115,16 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + - - - - diff --git a/projectfiles_vc7/blender/src/BL_src.vcproj b/projectfiles_vc7/blender/src/BL_src.vcproj index 76e6eb4026b..1f75acb014f 100644 --- a/projectfiles_vc7/blender/src/BL_src.vcproj +++ b/projectfiles_vc7/blender/src/BL_src.vcproj @@ -1,7 +1,7 @@ @@ -21,7 +21,7 @@ - + + + + @@ -294,6 +298,9 @@ + + @@ -333,6 +340,9 @@ + + @@ -357,6 +367,9 @@ + + @@ -393,6 +406,9 @@ + + @@ -420,6 +436,9 @@ + + @@ -429,6 +448,9 @@ + + @@ -447,6 +469,12 @@ + + + + @@ -634,6 +662,9 @@ + + @@ -709,9 +740,6 @@ - - @@ -745,9 +773,18 @@ + + + + + + @@ -778,6 +815,12 @@ + + + + diff --git a/projectfiles_vc7/blender/src/BL_src_cre.vcproj b/projectfiles_vc7/blender/src/BL_src_cre.vcproj index bd40b56ade1..b381dcecc25 100644 --- a/projectfiles_vc7/blender/src/BL_src_cre.vcproj +++ b/projectfiles_vc7/blender/src/BL_src_cre.vcproj @@ -1,7 +1,7 @@ @@ -116,7 +116,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + - + + @@ -118,7 +118,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -326,7 +326,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + - + + @@ -217,7 +217,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -159,7 +159,8 @@ ECHO Done Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -21,7 +21,7 @@ - + + + + + + + + + + @@ -359,6 +372,9 @@ + + @@ -407,6 +423,9 @@ + + @@ -517,6 +536,18 @@ + + + + + + + + @@ -553,6 +584,9 @@ + + @@ -604,6 +638,9 @@ + + diff --git a/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj b/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj index a757a2cb0e0..8aba059d029 100644 --- a/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj +++ b/projectfiles_vc7/gameengine/ketsji/network/KX_network.vcproj @@ -1,7 +1,7 @@ @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -278,7 +278,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -217,7 +217,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + + + + + diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj index 0a46cde5bc1..a8d6e77cd58 100644 --- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj +++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj @@ -1,7 +1,7 @@ @@ -300,7 +300,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + + + @@ -341,12 +345,21 @@ + + + + + + diff --git a/projectfiles_vc7/gameengine/scenegraph/SG_SceneGraph.vcproj b/projectfiles_vc7/gameengine/scenegraph/SG_SceneGraph.vcproj index 753c0718f73..02bb647eb92 100644 --- a/projectfiles_vc7/gameengine/scenegraph/SG_SceneGraph.vcproj +++ b/projectfiles_vc7/gameengine/scenegraph/SG_SceneGraph.vcproj @@ -1,7 +1,7 @@ @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -320,7 +320,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + + @@ -323,7 +323,8 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - + +