diff options
author | Joseph Gilbert <ascotan@gmail.com> | 2005-02-21 00:33:11 +0300 |
---|---|---|
committer | Joseph Gilbert <ascotan@gmail.com> | 2005-02-21 00:33:11 +0300 |
commit | 61767b4f483613f4060524abd9cb7e74aae355ea (patch) | |
tree | 943f75c63f971117cedaa0351d01eb77500ab203 /projectfiles_vc7/blender/blenlib | |
parent | 7ad68dd4a6486fdafb94480485eed1702a2b5646 (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/blenlib')
-rw-r--r-- | projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj | 227 |
1 files changed, 182 insertions, 45 deletions
diff --git a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj index 09c3c9f0b79..040e01f4af2 100644 --- a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj +++ b/projectfiles_vc7/blender/blenlib/BLI_blenlib.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="BLI_blenlib" SccProjectName="" SccLocalPath=""> @@ -11,9 +11,9 @@ </Platforms> <Configurations> <Configuration - Name="MT DLL Release|Win32" - OutputDirectory=".\..\..\..\obj\windows\blender\blenlib\mtdll" - IntermediateDirectory=".\..\..\..\obj\windows\blender\blenlib\mtdll" + Name="3D Plugin Release|Win32" + OutputDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll" + IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -21,24 +21,26 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\guardedalloc\include,..\..\..\source\blender\blenlib,..\..\..\source\blender\python,..\..\..\source\blender\makesdna" - PreprocessorDefinitions="NDEBUG,WIN32,_LIB" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\extern\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel" + PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\blenlib\mtdll/BLI_blenlib.pch" - AssemblerListingLocation=".\..\..\..\obj\windows\blender\blenlib\mtdll/" - ObjectFile=".\..\..\..\obj\windows\blender\blenlib\mtdll/" - ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\blenlib\mtdll/" + PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\BLI_blenlib.pch" + AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\" + ObjectFile="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\" + ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\" + WarningLevel="2" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile=".\..\..\..\obj\windows\blender\blenlib\mtdll\BLI_blenlib.lib" + OutputFile="..\..\..\..\build\msvc_7\libs\mtdll\BLI_blenlib.lib" + AdditionalLibraryDirectories="" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -54,11 +56,17 @@ Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\..\..\..\obj\windows\blender\blenlib\debug" - IntermediateDirectory=".\..\..\..\obj\windows\blender\blenlib\debug" + Name="Blender Debug|Win32" + OutputDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\debug" + IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -66,16 +74,18 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\guardedalloc\include,..\..\..\..\lib\windows\freetype\include,..\..\..\source\blender\include,..\..\..\source\blender\blenlib,..\..\..\source\blender\blenkernel,..\..\..\source\blender\python,..\..\..\source\blender\makesdna" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\extern\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel" PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_FREETYPE2" BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="TRUE" - PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\blenlib\debug/BLI_blenlib.pch" - AssemblerListingLocation=".\..\..\..\obj\windows\blender\blenlib\debug/" - ObjectFile=".\..\..\..\obj\windows\blender\blenlib\debug/" - ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\blenlib\debug/" - WarningLevel="3" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="StdAfx.h" + PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\BLI_blenlib.pch" + AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\" + ObjectFile="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\" + ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\" + WarningLevel="2" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> @@ -83,7 +93,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile=".\..\..\..\obj\windows\blender\blenlib\debug\BLI_blenlib.lib" + OutputFile="..\..\..\..\build\msvc_7\libs\debug\BLI_blenlib.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -99,11 +109,17 @@ Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\..\..\..\obj\windows\blender\blenlib" - IntermediateDirectory=".\..\..\..\obj\windows\blender\blenlib" + Name="Blender Release|Win32" + OutputDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib" + IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -111,24 +127,25 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\guardedalloc\include,..\..\..\..\lib\windows\freetype\include,..\..\..\source\blender\include,..\..\..\source\blender\blenlib,..\..\..\source\blender\blenkernel,..\..\..\source\blender\python,..\..\..\source\blender\makesdna" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\extern\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" DefaultCharIsUnsigned="TRUE" - PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\blenlib/BLI_blenlib.pch" - AssemblerListingLocation=".\..\..\..\obj\windows\blender\blenlib/" - ObjectFile=".\..\..\..\obj\windows\blender\blenlib/" - ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\blenlib/" - WarningLevel="3" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\blenlib\BLI_blenlib.pch" + AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\blenlib\" + ObjectFile="..\..\..\..\build\msvc_7\source\blender\blenlib\" + ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\blenlib\" + WarningLevel="2" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile=".\..\..\..\obj\windows\blender\blenlib\BLI_blenlib.lib" + OutputFile="..\..\..\..\build\msvc_7\libs\BLI_blenlib.lib" AdditionalLibraryDirectories="" SuppressStartupBanner="TRUE"/> <Tool @@ -145,11 +162,17 @@ Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="MT DLL Debug|Win32" - OutputDirectory=".\..\..\..\obj\windows\blender\blenlib\mtdll_debug" - IntermediateDirectory=".\..\..\..\obj\windows\blender\blenlib\mtdll_debug" + Name="3D Plugin Debug|Win32" + OutputDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\debug" + IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -157,24 +180,78 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\guardedalloc\include,..\..\..\source\blender\blenlib,..\..\..\source\blender\python,..\..\..\source\blender\makesdna" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\extern\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\blenlib\mtdll_debug/BLI_blenlib.pch" - AssemblerListingLocation=".\..\..\..\obj\windows\blender\blenlib\mtdll_debug/" - ObjectFile=".\..\..\..\obj\windows\blender\blenlib\mtdll_debug/" - ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\blenlib\mtdll_debug/" + PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\debug\BLI_blenlib.pch" + AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\debug\" + ObjectFile="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\debug\" + ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\blenlib\mtdll\debug\" + WarningLevel="2" + SuppressStartupBanner="TRUE" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\build\msvc_7\libs\mtdll\debug\BLI_blenlib.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="BlenderPlayer Debug|Win32" + OutputDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\blenplayer" + IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\blenplayer" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\extern\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel" + PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_FREETYPE2" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + DefaultCharIsUnsigned="TRUE" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="StdAfx.h" + PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\BLI_blenlib.pch" + AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\" + ObjectFile="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\" + ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\blenlib\debug\" + WarningLevel="2" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile=".\..\..\..\obj\windows\blender\blenlib\mtdll_debug\BLI_blenlib.lib" + OutputFile="..\..\..\..\build\msvc_7\libs\debug\BLI_blenlib.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -190,13 +267,76 @@ Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="BlenderPlayer Release|Win32" + OutputDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\blenplayer" + IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\blenlib\blenplayer" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\extern\freetype\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel" + PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2" + StringPooling="TRUE" + RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" + DefaultCharIsUnsigned="TRUE" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\blenlib\BLI_blenlib.pch" + AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\blenlib\" + ObjectFile="..\..\..\..\build\msvc_7\source\blender\blenlib\" + ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\blenlib\" + WarningLevel="2" + SuppressStartupBanner="TRUE" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\build\msvc_7\libs\BLI_blenlib.lib" + AdditionalLibraryDirectories="" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + 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\blenlib\intern\arithb.c"> + </File> + <File RelativePath="..\..\..\source\blender\blenlib\intern\BLI_dynstr.c"> </File> <File @@ -209,9 +349,6 @@ RelativePath="..\..\..\source\blender\blenlib\intern\BLI_memarena.c"> </File> <File - RelativePath="..\..\..\source\blender\blenlib\intern\arithb.c"> - </File> - <File RelativePath="..\..\..\source\blender\blenlib\intern\dynlib.c"> </File> <File |