Revision: 19691
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19691
Author: elubie
Date: 2009-04-12 22:34:46 +0200 (Sun, 12 Apr 2009)
Log Message:
-----------
2.5 MSVC projectfiles
- added missing files
- cleanup of some project settings
- RNA building has dependency issue: had to add interface_api.c to the makesrna
project and makesrna and rna projects now include editors.
- added debug libraries for OpenExr, please update lib/windows/openexr to get
them
Modified Paths:
--------------
branches/blender2.5/blender/extern/bullet2/make/msvc_9_0/Bullet.vcproj
branches/blender2.5/blender/extern/make/msvc_9_0/build_install_all.vcproj
branches/blender2.5/blender/projectfiles_vc9/blender/blender.sln
branches/blender2.5/blender/projectfiles_vc9/blender/blender.vcproj
branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
Modified: branches/blender2.5/blender/extern/bullet2/make/msvc_9_0/Bullet.vcproj
===================================================================
--- branches/blender2.5/blender/extern/bullet2/make/msvc_9_0/Bullet.vcproj
2009-04-12 20:32:42 UTC (rev 19690)
+++ branches/blender2.5/blender/extern/bullet2/make/msvc_9_0/Bullet.vcproj
2009-04-12 20:34:46 UTC (rev 19691)
@@ -45,7 +45,7 @@
Optimization="0"
AdditionalIncludeDirectories="..\..\src"
PreprocessorDefinitions="_DEBUG;_LIB;WIN32;BUM_INLINED;USE_ALGEBRAIC"
- ExceptionHandling="0"
+ ExceptionHandling="1"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
Modified:
branches/blender2.5/blender/extern/make/msvc_9_0/build_install_all.vcproj
===================================================================
--- branches/blender2.5/blender/extern/make/msvc_9_0/build_install_all.vcproj
2009-04-12 20:32:42 UTC (rev 19690)
+++ branches/blender2.5/blender/extern/make/msvc_9_0/build_install_all.vcproj
2009-04-12 20:34:46 UTC (rev 19691)
@@ -23,7 +23,7 @@
ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
- ManagedExtensions="4"
+ ManagedExtensions="0"
>
<Tool
Name="VCPreBuildEventTool"
Modified: branches/blender2.5/blender/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/blender2.5/blender/projectfiles_vc9/blender/blender.sln
2009-04-12 20:32:42 UTC (rev 19690)
+++ branches/blender2.5/blender/projectfiles_vc9/blender/blender.sln
2009-04-12 20:34:46 UTC (rev 19691)
@@ -39,7 +39,6 @@
{213356A9-3A1F-41DA-9819-1297BCD17DEE} =
{213356A9-3A1F-41DA-9819-1297BCD17DEE}
{727F90AC-ABE6-40BF-8937-C2F2F1D13DEA} =
{727F90AC-ABE6-40BF-8937-C2F2F1D13DEA}
{BAC615B0-F1AF-418B-8D23-A10FD8870D6A} =
{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90} =
{A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}
{E90C7BC2-CF30-4A60-A8F2-0050D592E358} =
{E90C7BC2-CF30-4A60-A8F2-0050D592E358}
{8B8D4FC3-3234-4E54-8376-5AB83D00D164} =
{8B8D4FC3-3234-4E54-8376-5AB83D00D164}
{9991A3C3-83FE-4AFE-9E18-9D01CB57E879} =
{9991A3C3-83FE-4AFE-9E18-9D01CB57E879}
@@ -95,8 +94,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EXP_expressions",
"..\gameengine\expression\EXP_expressions.vcproj",
"{EADC3C5A-6C51-4F03-8038-1553E7D7F740}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTF_ftfont",
"ftfont\FTF_ftfont.vcproj", "{A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GP_axctl",
"..\gameengine\gameplayer\axctl\GP_axctl.vcproj",
"{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}"
ProjectSection(ProjectDependencies) = postProject
{E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F} =
{E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}
@@ -336,6 +333,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RNA_makesrna",
"makesrna\RNA_makesrna.vcproj", "{8C2BCCF8-4D9E-46D3-BABF-C1545A332CE6}"
ProjectSection(ProjectDependencies) = postProject
+ {FB88301F-F725-401B-ACD7-D2ABBF333B71} =
{FB88301F-F725-401B-ACD7-D2ABBF333B71}
{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284} =
{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284}
EndProjectSection
EndProject
@@ -549,20 +547,6 @@
{EADC3C5A-6C51-4F03-8038-1553E7D7F740}.Debug|Win32.Build.0 =
BlenderPlayer Debug|Win32
{EADC3C5A-6C51-4F03-8038-1553E7D7F740}.Release|Win32.ActiveCfg
= BlenderPlayer Release|Win32
{EADC3C5A-6C51-4F03-8038-1553E7D7F740}.Release|Win32.Build.0 =
BlenderPlayer Release|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.3D Plugin
Debug|Win32.ActiveCfg = Blender Debug|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.3D Plugin
Debug|Win32.Build.0 = Blender Debug|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.3D Plugin
Release|Win32.ActiveCfg = Blender Debug|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.3D Plugin
Release|Win32.Build.0 = Blender Debug|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.Blender
Debug|Win32.ActiveCfg = Blender Debug|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.Blender
Debug|Win32.Build.0 = Blender Debug|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.Blender
Release|Win32.ActiveCfg = Blender Release|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.Blender
Release|Win32.Build.0 = Blender Release|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.BlenderPlayer
Debug|Win32.ActiveCfg = Blender Debug|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.BlenderPlayer
Release|Win32.ActiveCfg = Blender Release|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.Debug|Win32.ActiveCfg =
Blender Debug|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.Debug|Win32.Build.0 =
Blender Debug|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.Release|Win32.ActiveCfg
= Blender Release|Win32
- {A1CCF5B0-08E1-4F00-B417-8BFAC34E5E90}.Release|Win32.Build.0 =
Blender Release|Win32
{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.3D Plugin
Debug|Win32.ActiveCfg = 3D Plugin Debug|Win32
{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.3D Plugin
Debug|Win32.Build.0 = 3D Plugin Debug|Win32
{DF25E6F2-780C-438B-8AAD-D10CF8B3820A}.3D Plugin
Release|Win32.ActiveCfg = 3D Plugin Release|Win32
Modified: branches/blender2.5/blender/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/blender2.5/blender/projectfiles_vc9/blender/blender.vcproj
2009-04-12 20:32:42 UTC (rev 19690)
+++ branches/blender2.5/blender/projectfiles_vc9/blender/blender.vcproj
2009-04-12 20:34:46 UTC (rev 19691)
@@ -167,7 +167,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386
"
- AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25_d.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib
Imath.lib IlmImf.lib IlmThread.lib avcodec-51.lib avformat-52.lib
avdevice-52.lib avutil-49.lib swscale-0.lib"
+ AdditionalDependencies="freetype2ST.lib
gnu_gettext.lib qtmlClient.lib openal_static.lib ws2_32.lib dxguid.lib
opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib
python25_d.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half_d.lib Iex_d.lib
Imath_d.lib IlmImf_d.lib IlmThread_d.lib avcodec-51.lib avformat-52.lib
avdevice-52.lib avutil-49.lib swscale-0.lib"
ShowProgress="0"
OutputFile="..\..\bin\debug\blender.exe"
LinkIncremental="2"
Modified:
branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
---
branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-04-12 20:32:42 UTC (rev 19690)
+++
branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-04-12 20:34:46 UTC (rev 19691)
@@ -222,6 +222,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\include\ED_image.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_interface.h"
>
</File>
@@ -282,6 +286,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\include\ED_text.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_transform.h"
>
</File>
@@ -314,10 +322,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\include\UI_text.h"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\include\UI_view2d.h"
>
</File>
@@ -367,6 +371,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\interface\interface_anim.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\interface\interface_draw.c"
>
</File>
@@ -395,6 +403,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\interface\interface_style.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\interface\interface_utils.c"
>
</File>
@@ -411,10 +423,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\interface\text.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\interface\view2d.c"
>
</File>
@@ -971,6 +979,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\animation\drivers.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\animation\keyframes_draw.c"
>
</File>
Modified:
branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
---
branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-04-12 20:32:42 UTC (rev 19690)
+++
branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-04-12 20:34:46 UTC (rev 19691)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\windowmanager"
+
AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\windowmanager"
PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -138,7 +138,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\windowmanager"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
