Revision: 15265 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15265 Author: blendix Date: 2008-06-18 13:04:30 +0200 (Wed, 18 Jun 2008)
Log Message: ----------- Apricot Branch: svn merge -r 15249:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/ (game engine shape keys!) Modified Paths: -------------- branches/apricot/extern/make/msvc_7_0/extern.sln branches/apricot/projectfiles_vc7/blender/blender.vcproj branches/apricot/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj branches/apricot/projectfiles_vc7/gameengine/converter/KX_converter.vcproj branches/apricot/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj branches/apricot/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/apricot/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj branches/apricot/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj branches/apricot/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj branches/apricot/source/blender/blenkernel/BKE_action.h branches/apricot/source/blender/blenkernel/BKE_key.h branches/apricot/source/blender/blenkernel/intern/action.c branches/apricot/source/blender/blenkernel/intern/key.c branches/apricot/source/blender/blenkernel/intern/sca.c branches/apricot/source/blender/blenloader/intern/readfile.c branches/apricot/source/blender/blenloader/intern/writefile.c branches/apricot/source/blender/makesdna/DNA_actuator_types.h branches/apricot/source/blender/render/intern/source/convertblender.c branches/apricot/source/blender/src/buttons_logic.c branches/apricot/source/blender/src/transform_constraints.c branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/apricot/source/gameengine/Converter/BL_DeformableGameObject.cpp branches/apricot/source/gameengine/Converter/BL_DeformableGameObject.h branches/apricot/source/gameengine/Converter/BL_MeshDeformer.cpp branches/apricot/source/gameengine/Converter/BL_MeshDeformer.h branches/apricot/source/gameengine/Converter/BL_SkinDeformer.cpp branches/apricot/source/gameengine/Converter/BL_SkinDeformer.h branches/apricot/source/gameengine/Converter/BL_SkinMeshObject.cpp branches/apricot/source/gameengine/Converter/BL_SkinMeshObject.h branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp branches/apricot/source/gameengine/GameLogic/SCA_IObject.h branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp branches/apricot/source/gameengine/Ketsji/KX_GameObject.h branches/apricot/source/gameengine/Ketsji/KX_RayCast.cpp branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp branches/apricot/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp branches/apricot/source/gameengine/Rasterizer/RAS_Deformer.h branches/apricot/source/gameengine/Rasterizer/RAS_MeshObject.cpp branches/apricot/source/gameengine/Rasterizer/RAS_MeshObject.h branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp Added Paths: ----------- branches/apricot/extern/glew/make/ branches/apricot/extern/glew/make/msvc_7_0/ branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj Removed Paths: ------------- branches/apricot/extern/glew/make/msvc_7_0/ branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj Copied: branches/apricot/extern/glew/make (from rev 15264, trunk/blender/extern/glew/make) Copied: branches/apricot/extern/glew/make/msvc_7_0 (from rev 15264, trunk/blender/extern/glew/make/msvc_7_0) Deleted: branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj =================================================================== --- trunk/blender/extern/glew/make/msvc_7_0/glew_vc7.vcproj 2008-06-18 10:30:14 UTC (rev 15264) +++ branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj 2008-06-18 11:04:30 UTC (rev 15265) @@ -1,146 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="glew" - ProjectGUID="{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}" - Keyword="Win32Proj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\extern\glew\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\glew\debug" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - MinimalRebuild="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\glew\debug\glew.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\glew\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\extern\glew\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\glew\debug\" - WarningLevel="2" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\debug\glew.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying GLEW files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\glew\include\GL MKDIR ..\..\..\..\..\build\msvc_7\extern\glew\include\GL -XCOPY /Y ..\..\include\GL\*.h ..\..\..\..\..\build\msvc_7\extern\glew\include\GL -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\extern\glew" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\glew" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\glew\glew.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\glew\" - ObjectFile="..\..\..\..\..\build\msvc_7\extern\glew\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\glew\" - WarningLevel="2" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\glew.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying GLEW files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\glew\include\GL MKDIR ..\..\..\..\..\build\msvc_7\extern\glew\include\GL -XCOPY /Y ..\..\include\GL\*.h ..\..\..\..\..\build\msvc_7\extern\glew\include\GL -ECHO Done -"/> - <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="..\..\src\glew.c"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> - <File - RelativePath="..\..\include\GL\glew.h"> - </File> - <File - RelativePath="..\..\include\GL\glxew.h"> - </File> - <File - RelativePath="..\..\include\GL\wglew.h"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Copied: branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj (from rev 15264, trunk/blender/extern/glew/make/msvc_7_0/glew_vc7.vcproj) =================================================================== --- branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj (rev 0) +++ branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj 2008-06-18 11:04:30 UTC (rev 15265) @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="glew" + ProjectGUID="{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Blender Debug|Win32" + OutputDirectory="..\..\..\..\..\build\msvc_7\extern\glew\debug" + IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\glew\debug" + ConfigurationType="4" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="FALSE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\glew\debug\glew.pch" + AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\glew\debug\" + ObjectFile="..\..\..\..\..\build\msvc_7\extern\glew\debug\" + ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\glew\debug\" + WarningLevel="2" + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\debug\glew.lib"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool" + Description="Copying GLEW files library (debug target) to lib tree." + CommandLine="ECHO Copying header files +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\glew\include\GL MKDIR ..\..\..\..\..\build\msvc_7\extern\glew\include\GL +XCOPY /Y ..\..\include\GL\*.h ..\..\..\..\..\build\msvc_7\extern\glew\include\GL +ECHO Done +"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Blender Release|Win32" + OutputDirectory="..\..\..\..\..\build\msvc_7\extern\glew" + IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\glew" + ConfigurationType="4" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\include" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\glew\glew.pch" + AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\glew\" + ObjectFile="..\..\..\..\..\build\msvc_7\extern\glew\" + ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\glew\" + WarningLevel="2" + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\glew.lib"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool" + Description="Copying GLEW files library to lib tree." + CommandLine="ECHO Copying header files +IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\glew\include\GL MKDIR ..\..\..\..\..\build\msvc_7\extern\glew\include\GL +XCOPY /Y ..\..\include\GL\*.h ..\..\..\..\..\build\msvc_7\extern\glew\include\GL +ECHO Done +"/> + <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="..\..\src\glew.c"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + <File + RelativePath="..\..\include\GL\glew.h"> + </File> + <File + RelativePath="..\..\include\GL\glxew.h"> + </File> + <File + RelativePath="..\..\include\GL\wglew.h"> + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: branches/apricot/extern/make/msvc_7_0/extern.sln =================================================================== --- branches/apricot/extern/make/msvc_7_0/extern.sln 2008-06-18 10:30:14 UTC (rev 15264) @@ 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