diff options
Diffstat (limited to 'projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj')
-rw-r--r-- | projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj | 1647 |
1 files changed, 0 insertions, 1647 deletions
diff --git a/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj deleted file mode 100644 index d0a360a6a9d..00000000000 --- a/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj +++ /dev/null @@ -1,1647 +0,0 @@ -<<<<<<< .working -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="BLI_blenlib" - ProjectGUID="{31628053-825D-4C06-8A21-D13883489718}" - RootNamespace="BLI_blenlib" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="3D Plugin Release|Win32" - OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll" - IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - DefaultCharIsUnsigned="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\BLI_blenlib.pch" - AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\" - ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\" - ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\" - WarningLevel="2" - SuppressStartupBanner="true" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\build\msvc_9\libs\mtdll\BLI_blenlib.lib" - AdditionalLibraryDirectories="" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\debug" - IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\debug" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
- PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - DefaultCharIsUnsigned="true" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="StdAfx.h" - PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\BLI_blenlib.pch" - AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\" - ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\" - ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\build\msvc_9\libs\debug\BLI_blenlib.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib" - IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB" - StringPooling="true" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - DefaultCharIsUnsigned="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\BLI_blenlib.pch" - AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\" - ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\" - ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\" - WarningLevel="2" - SuppressStartupBanner="true" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\build\msvc_9\libs\BLI_blenlib.lib" - AdditionalLibraryDirectories="" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="3D Plugin Debug|Win32" - OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug" - IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
- PreprocessorDefinitions="_DEBUG,WIN32,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - DefaultCharIsUnsigned="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug\BLI_blenlib.pch" - AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug\" - ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\build\msvc_9\libs\mtdll\debug\BLI_blenlib.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="BlenderPlayer Debug|Win32" - OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\blenplayer" - IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\blenplayer" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
- PreprocessorDefinitions="_DEBUG,WIN32,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - DefaultCharIsUnsigned="true" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="StdAfx.h" - PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\BLI_blenlib.pch" - AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\" - ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\" - ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\" - WarningLevel="2" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\build\msvc_9\libs\debug\BLI_blenlib.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="BlenderPlayer Release|Win32" - OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\blenplayer" - IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\blenplayer" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB" - StringPooling="true" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - DefaultCharIsUnsigned="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\BLI_blenlib.pch" - AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\" - ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\" - ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\" - WarningLevel="2" - SuppressStartupBanner="true" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\build\msvc_9\libs\BLI_blenlib.lib" - AdditionalLibraryDirectories="" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_bfile.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_cellalloc.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_dynstr.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_ghash.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_heap.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_kdopbvh.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_kdtree.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_linklist.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_memarena.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_mempool.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\boxpack2d.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\bpath.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\DLRB_tree.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\dynamiclist.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\dynlib.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\edgehash.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\fileops.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\fnmatch.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\freetypefont.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\graph.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\gsqueue.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\jitter.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\listbase.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\math_base.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\math_color.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\math_geom.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\math_matrix.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\math_rotation.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\math_vector.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\math_vector_inline.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\noise.c" - > - </File> - <File -======= -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="BLI_blenlib"
- ProjectGUID="{31628053-825D-4C06-8A21-D13883489718}"
- RootNamespace="BLI_blenlib"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="3D Plugin Release|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll"
- IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- DefaultCharIsUnsigned="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\BLI_blenlib.pch"
- AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\"
- ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\build\msvc_9\libs\mtdll\BLI_blenlib.lib"
- AdditionalLibraryDirectories=""
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\debug"
- IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
- PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- DefaultCharIsUnsigned="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough="StdAfx.h"
- PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\BLI_blenlib.pch"
- AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\"
- ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\"
- ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\"
- WarningLevel="4"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\build\msvc_9\libs\debug\BLI_blenlib.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib"
- IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- DefaultCharIsUnsigned="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\BLI_blenlib.pch"
- AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\"
- ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\"
- ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\build\msvc_9\libs\BLI_blenlib.lib"
- AdditionalLibraryDirectories=""
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="3D Plugin Debug|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug"
- IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
- PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- DefaultCharIsUnsigned="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug\BLI_blenlib.pch"
- AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug\"
- ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\build\msvc_9\libs\mtdll\debug\BLI_blenlib.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="BlenderPlayer Debug|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\blenplayer"
- IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\blenplayer"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
- PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- DefaultCharIsUnsigned="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough="StdAfx.h"
- PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\BLI_blenlib.pch"
- AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\"
- ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\"
- ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\build\msvc_9\libs\debug\BLI_blenlib.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="BlenderPlayer Release|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\blenplayer"
- IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\blenlib\blenplayer"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- DefaultCharIsUnsigned="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\blenlib\BLI_blenlib.pch"
- AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\"
- ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\"
- ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\build\msvc_9\libs\BLI_blenlib.lib"
- AdditionalLibraryDirectories=""
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_args.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_bfile.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_dynstr.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_ghash.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_heap.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_kdopbvh.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_kdtree.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_linklist.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_memarena.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_mempool.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\boxpack2d.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\bpath.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\cpu.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\DLRB_tree.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\dynlib.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\edgehash.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\fileops.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\fnmatch.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\freetypefont.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\graph.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\gsqueue.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\jitter.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\listbase.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\math_base.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\math_base_inline.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\math_color.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\math_geom.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\math_geom_inline.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\math_matrix.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\math_rotation.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\math_vector.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\math_vector_inline.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\noise.c"
- >
- </File>
- <File
->>>>>>> .merge-right.r30358 - RelativePath="..\..\..\source\blender\blenlib\intern\path_util.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\pbvh.c"
- >
- </File>
- <File
-<<<<<<< .working - RelativePath="..\..\..\source\blender\blenlib\intern\rand.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\rct.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\scanfill.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\storage.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\string.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\threads.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\time.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\voxel.c" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\winstuff.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_array.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_bfile.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_blenlib.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_boxpack2d.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_bpath.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\intern\BLI_callbacks.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_cellalloc.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_dlrbTree.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_dynamiclist.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_edgehash.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_editVert.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_fileops.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_fnmatch.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_ghash.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_graph.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_heap.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_jitter.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_kdopbvh.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_kdtree.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_linklist.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_math.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_math_base.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_math_color.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_math_geom.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_math_matrix.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_math_rotation.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_math_vector.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_memarena.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_mempool.h" - > - </File> - <File -======= - RelativePath="..\..\..\source\blender\blenlib\intern\rand.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\rct.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\scanfill.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\storage.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\string.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\threads.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\time.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\uvproject.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\voxel.c"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\winstuff.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_args.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_bfile.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_blenlib.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_boxpack2d.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_bpath.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\intern\BLI_callbacks.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_cpu.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_dlrbTree.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_edgehash.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_editVert.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_fileops.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_fnmatch.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_ghash.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_graph.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_heap.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_jitter.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_kdopbvh.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_kdtree.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_linklist.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_math.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_math_base.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_math_color.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_math_geom.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_math_inline.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_math_matrix.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_math_rotation.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_math_vector.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_memarena.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_mempool.h"
- >
- </File>
- <File
->>>>>>> .merge-right.r30358 - RelativePath="..\..\..\source\blender\blenlib\BLI_path_util.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_pbvh.h"
- >
- </File>
- <File
-<<<<<<< .working - RelativePath="..\..\..\source\blender\blenlib\BLI_scanfill.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_storage.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_storage_types.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_string.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_threads.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_voxel.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\BLI_winstuff.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\PIL_dynlib.h" - > - </File> - <File - RelativePath="..\..\..\source\blender\blenlib\PIL_time.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> -======= - RelativePath="..\..\..\source\blender\blenlib\BLI_scanfill.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_storage.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_storage_types.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_string.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_threads.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_uvproject.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_voxel.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\BLI_winstuff.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\PIL_dynlib.h"
- >
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenlib\PIL_time.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
->>>>>>> .merge-right.r30358 |