diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
commit | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (patch) | |
tree | d00eb50b749cb001e2b08272c91791e66740b05d /projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj | |
parent | 78a1c27c4a6abe0ed31ca93ad21910f3df04da56 (diff) | |
parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) |
Merge of trunk into blender 2.5:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416
Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
later added in trunk also, but reverted partially, specifically revision
16683. I have left out this reversion in the 2.5 branch since I think it is
needed there.
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
-W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
differently. Since this is changed so much, and I don't think those fixes
would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
initialized when running with -P. The code that initializes the screen there
I had to disable, that can't work in 2.5 anymore but left it commented as a
reminder.
Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.
Still to be done:
* Go over files and functions that were moved to a different location but could
still use changes that were done in trunk.
Diffstat (limited to 'projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj')
-rw-r--r-- | projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj | 226 |
1 files changed, 226 insertions, 0 deletions
diff --git a/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj b/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj new file mode 100644 index 00000000000..0c35bc62e99 --- /dev/null +++ b/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj @@ -0,0 +1,226 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="TEX_Video"
+ ProjectGUID="{670EC17A-0548-4BBF-A27B-636C7C188139}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug"
+ IntermediateDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug"
+ ConfigurationType="4"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"
+ StringPooling="FALSE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ DefaultCharIsUnsigned="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\gameengine\gamelogic\debug\TEX_Video.pch"
+ AssemblerListingLocation="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug\"
+ ObjectFile="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug\"
+ ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug\"
+ WarningLevel="2"
+ Detect64BitPortabilityProblems="FALSE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\..\..\..\build\msvc_7\libs\debug\TEX_Video.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture"
+ IntermediateDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture"
+ ConfigurationType="4"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"
+ StringPooling="TRUE"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="TRUE"
+ DefaultCharIsUnsigned="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\gameengine\gamelogic\TEX_Video.pch"
+ AssemblerListingLocation="..\..\..\..\build\msvc_7\source\gameengine\videotexture\"
+ ObjectFile="..\..\..\..\build\msvc_7\source\gameengine\videotexture\"
+ ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\gameengine\videotexture\"
+ WarningLevel="2"
+ Detect64BitPortabilityProblems="FALSE"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ ShowIncludes="FALSE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\..\..\..\build\msvc_7\libs\TEX_Video.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\blendVideoTex.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\Exception.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBase.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBlueScreen.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterColor.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterNormal.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterSource.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBase.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBuff.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageMix.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageRender.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageViewport.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\PyTypeList.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\Texture.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\VideoBase.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\VideoFFmpeg.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\BlendType.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\Common.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\Exception.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBase.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBlueScreen.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterColor.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterNormal.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\FilterSource.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBase.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBuff.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageMix.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageRender.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\ImageViewport.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\PyTypeList.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\Texture.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\VideoBase.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\VideoTexture\VideoFFmpeg.h">
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
|