Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Gilbert <ascotan@gmail.com>2005-02-21 00:33:11 +0300
committerJoseph Gilbert <ascotan@gmail.com>2005-02-21 00:33:11 +0300
commit61767b4f483613f4060524abd9cb7e74aae355ea (patch)
tree943f75c63f971117cedaa0351d01eb77500ab203 /projectfiles_vc7/blender/render
parent7ad68dd4a6486fdafb94480485eed1702a2b5646 (diff)
MSVC7 update and freetype2 source
- Added correct .libs to be linked to GP_Ghost - Fixed incorrect library extensions for the linker (*.lib and not unix *.a) - Projects have been set to be multi-threaded - projects were being linked to different versions of the CRT - All projects are now linking to python 2.3 (this fixes an error regarding struct sizes in python) - Removed invalid source paths from inclusion for the compiler - Fix dependency issues with the GP_Ghost module - Proper .dll's are now being copied to their respective locations for debug and release version of blender/blenderplayer - Warnings have been set to level 2 - Import paths have been updated and organized for the compiler - Duplicate import paths for the compiler have been removed - Removed silly silly silly silly unix path-separators from window paths - Post-Build scripts have been updated where neccessary (XCOPY is retatined) - Fixed the output of various .lib files (PHY_Sumo and Yafray) - PHY_Sumo now uses a .pch - Removed #undef _DEBUG from debug builds :p - FTF_Font is now contains a debug build and is being set to it's correct output path - Blender/Blenderplayer/3DPlugin all linkto Debug libs where appropriate (instead of static release libs to avoid conflicts with the CRT) - Python23_d.dll is now loaded into a true debug output of both blenderplayer and blender debug builds - msvcrtd.dll is now loaded into a true debug output of both blenderplayer and blender debug builds - Post-builds now clean up their mess - ActiveX controller now builds - BlenderPlayer now builds - Internal libs now using .pch - Moved the build directory from /blender/obj to ../build/msvc_7/ to follow precedence with scons builds - Builds are now organized to follow precedence with scons builds with a /libs and a /intern /extern /source obj folders - Set the proper build path for opennl - Forcing BLO_loader source files to follow project defaults - Added an 'extern' project that mimics the /make build of the 'intern' project - Extern build includes solid and it's associated builds, ftgl, and freetype - Added .vcproj files to /extern directory - Added new extern.sln file to /extern directory - All project now link to the built solid.lib from the extern project instead of lib/windows - Removed uneeded XCOPYs commands from post-builds - Added conditional Directory building to post-builds - Freetype2 source commit (this is need for the building of a correct MFC linked version of the activeX controller as well as a correct release and debug build of the blender project) - Ftgl is built and linked by the 'extern' project - Intern/Extern project are now exporting their proper header files - PHY_Physics is now linking to the correct set of header files (in build path not source) - Makesdna builds object files into build directory now - Projects are now ignoring the CORRECT versions of the CRT's :) - Renderconverter is now outputting it's obj file to it's own directory instead of /render - Gen_system is now being built to ../kernel - BL_src_cre is now being built to /creator - *.exp and *.ilk are now being cleaned up from linkers - Libpng.dll and zlib.dll are now being copied to the /bin - MTDLL build are now available for the correct projects - ActiveX 3D Plugin now links correctly to solid and freetype2 - Corrected the Preprocessor #define that was labeled incorrectly in FTF_Font and Blender that was causing the FTGL libs to export dll calling conventions. - Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for internal and external librarys - Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for blender and added 2 new solutions configurations BlenderPlayer Release, Debug -
Diffstat (limited to 'projectfiles_vc7/blender/render')
-rw-r--r--projectfiles_vc7/blender/render/BRE_render.vcproj88
1 files changed, 52 insertions, 36 deletions
diff --git a/projectfiles_vc7/blender/render/BRE_render.vcproj b/projectfiles_vc7/blender/render/BRE_render.vcproj
index d28e0e2028f..834cd5e3228 100644
--- a/projectfiles_vc7/blender/render/BRE_render.vcproj
+++ b/projectfiles_vc7/blender/render/BRE_render.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7.0"
Name="BRE_render"
SccProjectName=""
SccLocalPath="">
@@ -11,9 +11,9 @@
</Platforms>
<Configurations>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\..\..\..\obj\windows\blender\render"
- IntermediateDirectory=".\..\..\..\obj\windows\blender\render"
+ Name="Blender Release|Win32"
+ OutputDirectory="..\..\..\..\build\msvc_7\source\blender\render"
+ IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\render"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -21,25 +21,25 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\guardedalloc\include;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_messaging;..\..\..\source\blender\imbuf;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\include;..\..\..\source\blender\misc;..\..\..\source\kernel;..\..\..\source\blender\blenlib;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\python;..\..\..\source\blender;..\..\..\source\blender\yafray"
+ AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
DefaultCharIsUnsigned="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\render/BRE_render.pch"
- AssemblerListingLocation=".\..\..\..\obj\windows\blender\render/"
- ObjectFile=".\..\..\..\obj\windows\blender\render/"
- ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\render/"
- WarningLevel="3"
+ PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\render\BRE_render.pch"
+ AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\render\"
+ ObjectFile="..\..\..\..\build\msvc_7\source\blender\render\"
+ ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\render\"
+ WarningLevel="2"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile=".\..\..\..\obj\windows\blender\render\BRE_render.lib"
+ OutputFile="..\..\..\..\build\msvc_7\libs\BRE_render.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
@@ -55,11 +55,17 @@
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\..\..\..\obj\windows\blender\render\debug"
- IntermediateDirectory=".\..\..\..\obj\windows\blender\render\debug"
+ Name="Blender Debug|Win32"
+ OutputDirectory="..\..\..\..\build\msvc_7\source\blender\render\debug"
+ IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\render\debug"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -67,17 +73,17 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\guardedalloc\include;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_messaging;..\..\..\source\blender\imbuf;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\include;..\..\..\source\blender\misc;..\..\..\source\kernel;..\..\..\source\blender\blenlib;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\python;..\..\..\source\blender;..\..\..\source\blender\yafray"
+ AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"
PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\render\debug/BRE_render.pch"
- AssemblerListingLocation=".\..\..\..\obj\windows\blender\render\debug/"
- ObjectFile=".\..\..\..\obj\windows\blender\render\debug/"
- ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\render\debug/"
- WarningLevel="3"
+ PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\render\debug\BRE_render.pch"
+ AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\render\debug\"
+ ObjectFile="..\..\..\..\build\msvc_7\source\blender\render\debug\"
+ ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\render\debug\"
+ WarningLevel="2"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
@@ -85,7 +91,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile=".\..\..\..\obj\windows\blender\render\debug\BRE_render.lib"
+ OutputFile="..\..\..\..\build\msvc_7\libs\debug\BRE_render.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
@@ -101,16 +107,20 @@
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
- RelativePath="..\..\..\source\blender\render\intern\source\RE_callbacks.c">
- </File>
- <File
RelativePath="..\..\..\source\blender\render\intern\source\edgeRender.c">
</File>
<File
@@ -123,6 +133,9 @@
RelativePath="..\..\..\source\blender\render\intern\source\gammaCorrectionTables.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\render\intern\source\imagetexture.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\render\intern\source\initrender.c">
</File>
<File
@@ -138,10 +151,7 @@
RelativePath="..\..\..\source\blender\render\intern\source\ray.c">
</File>
<File
- RelativePath="..\..\..\source\blender\render\intern\source\renderHelp.c">
- </File>
- <File
- RelativePath="..\..\..\source\blender\render\intern\source\renderPreAndPost.c">
+ RelativePath="..\..\..\source\blender\render\intern\source\RE_callbacks.c">
</File>
<File
RelativePath="..\..\..\source\blender\render\intern\source\rendercore.c">
@@ -150,6 +160,12 @@
RelativePath="..\..\..\source\blender\render\intern\source\renderdatabase.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\render\intern\source\renderHelp.c">
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\render\intern\source\renderPreAndPost.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\render\intern\source\shadbuf.c">
</File>
<File
@@ -169,9 +185,6 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
- RelativePath="..\..\..\source\blender\render\intern\include\RE_callbacks.h">
- </File>
- <File
RelativePath="..\..\..\source\blender\render\intern\include\edgeRender.h">
</File>
<File
@@ -205,10 +218,7 @@
RelativePath="..\..\..\source\blender\render\intern\include\pixelshading.h">
</File>
<File
- RelativePath="..\..\..\source\blender\render\intern\include\renderHelp.h">
- </File>
- <File
- RelativePath="..\..\..\source\blender\render\intern\include\renderPreAndPost.h">
+ RelativePath="..\..\..\source\blender\render\intern\include\RE_callbacks.h">
</File>
<File
RelativePath="..\..\..\source\blender\render\intern\include\rendercore.h">
@@ -217,6 +227,12 @@
RelativePath="..\..\..\source\blender\render\intern\include\rendercore_int.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\render\intern\include\renderHelp.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\render\intern\include\renderPreAndPost.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\render\intern\include\shadbuf.h">
</File>
<File