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/make/msvc_9_0/libverse.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 'extern/verse/make/msvc_9_0/libverse.vcproj')
-rw-r--r-- | extern/verse/make/msvc_9_0/libverse.vcproj | 368 |
1 files changed, 368 insertions, 0 deletions
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>
|