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 /extern/verse | |
| 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 'extern/verse')
| -rw-r--r-- | extern/verse/dist/v_bignum.c | 2 | ||||
| -rw-r--r-- | extern/verse/dist/v_network.c | 2 | ||||
| -rw-r--r-- | extern/verse/make/msvc_9_0/libverse.vcproj | 368 | ||||
| -rw-r--r-- | extern/verse/make/msvc_9_0/verse.vcproj | 669 |
4 files changed, 1039 insertions, 2 deletions
diff --git a/extern/verse/dist/v_bignum.c b/extern/verse/dist/v_bignum.c index 3f3ea7f9ccc..3f65af03427 100644 --- a/extern/verse/dist/v_bignum.c +++ b/extern/verse/dist/v_bignum.c @@ -768,7 +768,7 @@ void v_bignum_square_half(VBigDig *x) for(j = i + 1; j < t; j++) { /* printf("computing uv=%X+2*%X*%X+%X\n", w[i + j], x[1 + j], x[1 + i], c);*/ - uv = x[1 + j] * x[1 + i]; + uv = ((VBigDigs)x[1 + j]) * ((VBigDigs)x[1 + i]); high = (uv & 0x80000000) != 0; uv *= 2; ouv = uv; /* Addition below might wrap and generate high bit. */ diff --git a/extern/verse/dist/v_network.c b/extern/verse/dist/v_network.c index 3d67218bb7e..408cc20e393 100644 --- a/extern/verse/dist/v_network.c +++ b/extern/verse/dist/v_network.c @@ -32,7 +32,7 @@ typedef unsigned short uint16; typedef short int16; typedef unsigned char uint8; typedef char int8; -typedef char boolean; +typedef unsigned char boolean; #include "v_cmd_gen.h" #include "v_network.h" diff --git a/extern/verse/make/msvc_9_0/libverse.vcproj b/extern/verse/make/msvc_9_0/libverse.vcproj new file mode 100644 index 00000000000..cbe236d5b55 --- /dev/null +++ b/extern/verse/make/msvc_9_0/libverse.vcproj @@ -0,0 +1,368 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="EXT_verse"
+ ProjectGUID="{531D4862-D0E7-4B9B-A0B6-B3A6A25B547A}"
+ RootNamespace="verse"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Blender Debug|Win32"
+ OutputDirectory="..\..\..\..\..\build\msvc_9\extern\verse\debug"
+ IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\verse\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="..\..\include;..\..\..\..\..\lib\windows\freetype\include"
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;FTGL_LIBRARY_STATIC"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\verse\debug\libverse.pch"
+ AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\verse\debug\"
+ ObjectFile="..\..\..\..\..\build\msvc_9\extern\verse\debug\"
+ ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\verse\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\extern\debug\verse.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Copying verse files library (debug target) to lib tree."
+ CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\verse\include\ MKDIR ..\..\..\..\..\build\msvc_9\extern\verse\include
XCOPY /Y ..\..\dist\*.h ..\..\..\..\..\build\msvc_9\extern\verse\include
ECHO Done
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Blender Release|Win32"
+ OutputDirectory="..\..\..\..\..\build\msvc_9\extern\verse"
+ IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\verse"
+ 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="..\..\include;..\..\..\..\..\lib\windows\freetype\include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;FTGL_LIBRARY_STATIC"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\extern\verse\libverse.pch"
+ AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\verse\"
+ ObjectFile="..\..\..\..\..\build\msvc_9\extern\verse\"
+ ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\verse\"
+ 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\extern\verse.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Copying verse files library to lib tree."
+ CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\verse\include\ MKDIR ..\..\..\..\..\build\msvc_9\extern\verse\include
XCOPY /Y ..\..\dist\*.h ..\..\..\..\..\build\msvc_9\extern\verse\include
ECHO Done
"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\..\dist\v_bignum.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_buf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_def_a.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_def_b.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_def_c.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_def_g.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_def_m.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_def_o.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_def_s.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_def_t.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_connect.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_connection.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_encryption.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_func_storage.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_gen_pack_a_node.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_gen_pack_b_node.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_gen_pack_c_node.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_gen_pack_g_node.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_gen_pack_init.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_gen_pack_m_node.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_gen_pack_o_node.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_gen_pack_s_node.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_gen_pack_t_node.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_man_pack_node.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_network.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_network_in_que.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_network_out_que.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_pack.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_pack_method.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_prime.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_randgen.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_util.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\verse_ms.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\..\dist\v_bignum.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_cmd_buf.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_connection.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_encryption.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_internal_verse.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_network.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_network_in_que.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_network_out_que.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_pack.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_randgen.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_util.h"
+ >
+ </File>
+ </Filter>
+ <File
+ RelativePath="..\..\dist\verse_ms.h"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/extern/verse/make/msvc_9_0/verse.vcproj b/extern/verse/make/msvc_9_0/verse.vcproj new file mode 100644 index 00000000000..39363156181 --- /dev/null +++ b/extern/verse/make/msvc_9_0/verse.vcproj @@ -0,0 +1,669 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="EXT_verse_server"
+ ProjectGUID="{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}"
+ RootNamespace="verse_server"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="3D Plugin Debug|Win32"
+ OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\debug"
+ IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\debug"
+ ConfigurationType="1"
+ 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"
+ TypeLibraryName=".\..\..\..\source\blender\makesdna\intern/DNA_makesdna.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
+ PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ DefaultCharIsUnsigned="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\debug\verse.pch"
+ AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\debug\"
+ ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\debug\"
+ ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesdna\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="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib odbc32.lib odbccp32.lib"
+ OutputFile=".\..\..\..\source\blender\makesdna\intern/DNA_makesdna.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern\mtdll\debug;..\..\..\..\build\msvc_9\libs\mtdll\debug"
+ IgnoreDefaultLibraryNames=" libc.lib, libcmt.lib, msvcrt.lib, libcd.lib, libcmtd.lib"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\debug\DNA_makesdna.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Building DNA"
+ CommandLine="CD ..\..\..\source\blender\makesdna\intern\
DNA_makesdna.exe dna.c
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Blender Release|Win32"
+ OutputDirectory="..\..\..\..\bin"
+ IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\verse\server"
+ ConfigurationType="1"
+ 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"
+ TypeLibraryName=".\..\..\..\source\blender\makesdna\intern/verse.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ DefaultCharIsUnsigned="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\source\blender\verse\server\verse.pch"
+ AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\verse\server\"
+ ObjectFile="..\..\..\..\..\build\msvc_9\extern\verse\server\"
+ ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\verse\server\"
+ WarningLevel="2"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="verse.lib ws2_32.lib"
+ OutputFile="..\..\..\..\bin\verse.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\..\..\..\..\build\msvc_9\libs\extern"
+ IgnoreDefaultLibraryNames="libc.lib"
+ ProgramDatabaseFile="..\..\..\..\..\build\msvc_9\extern\verse\server\verse.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="3D Plugin Release|Win32"
+ OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll"
+ IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll"
+ ConfigurationType="1"
+ 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"
+ TypeLibraryName=".\..\..\..\source\blender\makesdna\intern/verse.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
+ PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ DefaultCharIsUnsigned="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\verse.pch"
+ AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\"
+ ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\"
+ ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\"
+ WarningLevel="2"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib odbc32.lib odbccp32.lib"
+ OutputFile="..\..\..\source\blender\makesdna\intern\verse.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern\mtdll;..\..\..\..\build\msvc_9\libs\mtdll"
+ IgnoreDefaultLibraryNames=" libc.lib, libcmt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib"
+ ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\verse.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Building DNA"
+ CommandLine="CD ..\..\..\source\blender\makesdna\intern\
verse.exe dna.c
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Blender Debug|Win32"
+ OutputDirectory="..\..\..\..\bin\debug"
+ IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\verse\server\debug"
+ ConfigurationType="1"
+ 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"
+ TypeLibraryName=".\..\..\..\source\blender\makesdna\intern/verse.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ DefaultCharIsUnsigned="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\source\blender\verse\server\debug\verse.pch"
+ ExpandAttributedSource="false"
+ AssemblerListingLocation="..\..\..\..\..\build\msvc_9\extern\verse\server\debug\"
+ ObjectFile="..\..\..\..\..\build\msvc_9\extern\verse\server\debug\"
+ ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\extern\verse\server\debug\"
+ WarningLevel="2"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386
"
+ AdditionalDependencies="verse.lib ws2_32.lib"
+ OutputFile="..\..\..\..\bin\debug\verse.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\..\..\..\..\build\msvc_9\libs\extern\debug"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="libcd"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="..\..\..\..\..\build\msvc_9\extern\verse\server\debug\verse.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="BlenderPlayer Debug|Win32"
+ OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesdna\debug\blenplayer"
+ IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesdna\debug\blenplayer"
+ ConfigurationType="1"
+ 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"
+ TypeLibraryName=".\..\..\..\source\blender\makesdna\intern/verse.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
+ PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ DefaultCharIsUnsigned="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesdna\debug\verse.pch"
+ ExpandAttributedSource="false"
+ AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesdna\debug\"
+ ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesdna\debug\"
+ ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesdna\debug\"
+ WarningLevel="2"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386
"
+ AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib odbc32.lib odbccp32.lib"
+ OutputFile="..\..\..\source\blender\makesdna\intern\verse.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern\debug;..\..\..\..\build\msvc_9\libs\debug"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="libc.lib, libcd.lib"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\debug\verse.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Building DNA"
+ CommandLine="CD ..\..\..\source\blender\makesdna\intern
verse.exe dna.c
"
+ />
+ </Configuration>
+ <Configuration
+ Name="BlenderPlayer Release|Win32"
+ OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesdna\blenplayer"
+ IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesdna\blenplayer"
+ ConfigurationType="1"
+ 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"
+ TypeLibraryName=".\..\..\..\source\blender\makesdna\intern/verse.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include"
+ PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ DefaultCharIsUnsigned="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesdna\verse.pch"
+ AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesdna\"
+ ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesdna\"
+ ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesdna\"
+ WarningLevel="2"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib odbc32.lib odbccp32.lib"
+ OutputFile="..\..\..\source\blender\makesdna\intern\verse.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern;..\..\..\..\build\msvc_9\libs"
+ IgnoreDefaultLibraryNames="libc.lib"
+ ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\verse.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Building DNA"
+ CommandLine="CD ..\..\..\source\blender\makesdna\intern\
verse.exe dna.c
"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\..\dist\vs_connection.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_main.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_master.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_audio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_bitmap.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_curve.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_geometry.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_head.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_material.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_object.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_particle.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_storage.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_node_text.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\..\dist\v_cmd_gen.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\v_util.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\verse.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dist\vs_server.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
|