Revision: 27783 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27783 Author: elubie Date: 2010-03-27 11:48:49 +0100 (Sat, 27 Mar 2010)
Log Message: ----------- MSVC 9 projectfiles Updated RNA project to generate the files in the build directory rather than inside the source tree. This removes the need to manually deleting those files when building from the same tree with scons or cmake. Modified Paths: -------------- trunk/blender/projectfiles_vc9/blender/blender.sln trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj trunk/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj Modified: trunk/blender/projectfiles_vc9/blender/blender.sln =================================================================== --- trunk/blender/projectfiles_vc9/blender/blender.sln 2010-03-27 10:48:01 UTC (rev 27782) +++ trunk/blender/projectfiles_vc9/blender/blender.sln 2010-03-27 10:48:49 UTC (rev 27783) @@ -259,6 +259,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INT_ghost", "..\..\intern\ghost\make\msvc_9_0\ghost.vcproj", "{76D90B92-ECC7-409C-9F98-A8814B90F3C0}" ProjectSection(ProjectDependencies) = postProject + {BAC615B0-F1AF-418B-8D23-A10FD8870D6A} = {BAC615B0-F1AF-418B-8D23-A10FD8870D6A} {B789C2F3-279E-4A85-8F0A-7F7AC068E598} = {B789C2F3-279E-4A85-8F0A-7F7AC068E598} EndProjectSection EndProject Modified: trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj =================================================================== --- trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2010-03-27 10:48:01 UTC (rev 27782) +++ trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2010-03-27 10:48:49 UTC (rev 27783) @@ -27,7 +27,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c" + CommandLine="del ..\..\..\..\build\msvc_9\source\blender\makesrna\rna_*_gen.c" /> <Tool Name="VCCustomBuildTool" @@ -45,7 +45,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesrna\internal" PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -74,7 +74,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe" + OutputFile="$(OutDir)\RNA_makesrna.exe" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="" @@ -106,13 +106,13 @@ <Tool Name="VCPostBuildEventTool" Description="Building RNA" - CommandLine="CD ..\..\..\source\blender\makesrna\intern
RNA_makesrna.exe rna.c
" + CommandLine="CD ..\..\..\source\blender\makesrna\intern\
$(TargetDir)\RNA_makesrna.exe ..\..\..\..\..\build\msvc_9\source\blender\makesrna
" /> </Configuration> <Configuration Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna" - IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna" + OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\release" + IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\release" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -121,7 +121,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c" + CommandLine="del ..\..\..\..\build\msvc_9\source\blender\makesrna\rna_*_gen.c" /> <Tool Name="VCCustomBuildTool" @@ -140,7 +140,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesrna\internal" PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE;GAMEBLENDER=1;WITH_SDL;WITH_OPENAL;WITH_JACK" StringPooling="true" RuntimeLibrary="0" @@ -148,9 +148,9 @@ DefaultCharIsUnsigned="true" UsePrecompiledHeader="0" PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesrna\DNA_makesrna.pch" - AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesrna\" - ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\" - ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\" + AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesrna\release\" + ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\release\" + ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\release\" WarningLevel="2" SuppressStartupBanner="true" CompileAs="0" @@ -169,7 +169,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe" + OutputFile="$(OutDir)\RNA_makesrna.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="" @@ -200,7 +200,7 @@ <Tool Name="VCPostBuildEventTool" Description="Building RNA" - CommandLine="CD ..\..\..\source\blender\makesrna\intern\
RNA_makesrna.exe .\
" + CommandLine="CD ..\..\..\source\blender\makesrna\intern\
$(TargetDir)RNA_makesrna.exe ..\..\..\..\..\build\msvc_9\source\blender\makesrna\
" /> </Configuration> <Configuration @@ -215,7 +215,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c" + CommandLine="del ..\..\..\..\build\msvc_9\source\blender\makesrna\rna_*_gen.c" /> <Tool Name="VCCustomBuildTool" @@ -233,7 +233,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesrna\internal" PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE" StringPooling="true" RuntimeLibrary="2" @@ -262,7 +262,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe" + OutputFile="$(OutDir)\RNA_makesrna.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="" @@ -293,7 +293,7 @@ <Tool Name="VCPostBuildEventTool" Description="Building RNA" - CommandLine="CD ..\..\..\source\blender\makesrna\intern
RNA_makesrna.exe rna.c
" + CommandLine="CD ..\..\..\source\blender\makesrna\intern\
$(TargetDir)\RNA_makesrna.exe ..\..\..\..\..\build\msvc_9\source\blender\makesrna
" /> </Configuration> <Configuration @@ -308,7 +308,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="del ..\..\..\source\blender\makesrna\intern\rna_*_gen.c" + CommandLine="del ..\..\..\..\build\msvc_9\source\blender\makesrna\rna_*_gen.c" /> <Tool Name="VCCustomBuildTool" @@ -326,7 +326,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesrna\internal" PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;GAMEBLENDER=1;WITH_SDL;WITH_OPENAL;WITH_JACK" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -356,7 +356,7 @@ <Tool @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs