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/src/BL_src.vcproj | |
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/src/BL_src.vcproj')
-rw-r--r-- | projectfiles_vc7/blender/src/BL_src.vcproj | 68 |
1 files changed, 41 insertions, 27 deletions
diff --git a/projectfiles_vc7/blender/src/BL_src.vcproj b/projectfiles_vc7/blender/src/BL_src.vcproj index 763e359a303..3e7c2ca88d0 100644 --- a/projectfiles_vc7/blender/src/BL_src.vcproj +++ b/projectfiles_vc7/blender/src/BL_src.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="BL_src" SccProjectName="" SccLocalPath=""> @@ -11,9 +11,9 @@ </Platforms> <Configurations> <Configuration - Name="Release|Win32" - OutputDirectory=".\..\..\..\obj\windows\blender\src" - IntermediateDirectory=".\..\..\..\obj\windows\blender\src" + Name="Blender Release|Win32" + OutputDirectory="..\..\..\..\build\msvc_7\source\blender\src" + IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\src" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -21,24 +21,25 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include\;..\..\..\source\blender\img;..\..\..\source\blender\renderui;..\..\..\..\lib\windows\soundsystem\include\;..\..\..\..\lib\windows\python\include\python2.0\;..\..\..\..\lib\windows\bmfont\include;..\..\..\..\lib\windows\guardedalloc\include;..\..\..\source\blender\renderconverter;..\..\..\source\blender\verify;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\ftfont;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\kernel\gen_system;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenlib;..\..\..\source\blender\misc;..\..\..\source\blender\python;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\include;..\..\..\source\blender;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\network;..\..\..\..\lib\windows\decimation\include;..\..\..\source\blender\blenpluginapi\;..\..\..\..\lib\windows\blenkey\include;..\..\..\..\lib\windows\ghost\include;..\..\..\..\lib\windows\opennl\include;..\..\..\..\lib\windows\bsp\include;..\..\..\..\lib\windows\QTDevWin\CIncludes" + AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.3;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal" PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" DefaultCharIsUnsigned="TRUE" - PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\src/BL_src.pch" - AssemblerListingLocation=".\..\..\..\obj\windows\blender\src/" - ObjectFile=".\..\..\..\obj\windows\blender\src/" - ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\src/" - WarningLevel="3" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\src\BL_src.pch" + AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\src\" + ObjectFile="..\..\..\..\build\msvc_7\source\blender\src\" + ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\src\" + WarningLevel="2" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile=".\..\..\..\obj\windows\blender\src\BL_src.lib" + OutputFile="..\..\..\..\build\msvc_7\libs\BL_src.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -54,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\src\debug" - IntermediateDirectory=".\..\..\..\obj\windows\blender\src\debug" + Name="Blender Debug|Win32" + OutputDirectory="..\..\..\..\build\msvc_7\source\blender\src\debug" + IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\src\debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -66,25 +73,25 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include\;..\..\..\source\blender\img;..\..\..\source\blender\renderui;..\..\..\..\lib\windows\soundsystem\include\;..\..\..\..\lib\windows\python\include\python2.0\;..\..\..\..\lib\windows\bmfont\include;..\..\..\source\blender\ftfont;..\..\..\..\lib\windows\guardedalloc\include;..\..\..\source\blender\renderconverter;..\..\..\source\blender\verify;..\..\..\source\blender\readstreamglue;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\kernel\gen_system;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenlib;..\..\..\source\blender\misc;..\..\..\source\blender\python;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\include;..\..\..\source\blender;..\..\..\source\blender\makesdna;..\..\..\source\gameengine\network;..\..\..\..\lib\windows\decimation\include;..\..\..\source\blender\blenpluginapi\;..\..\..\..\lib\windows\blenkey\include;..\..\..\..\lib\windows\ghost\include;..\..\..\..\lib\windows\bsp\include;..\..\..\..\lib\windows\QTDevWin\CIncludes" - PreprocessorDefinitions="WIN32,_LIB,_CONSOLE,GAMEBLENDER,WITH_QUICKTIME,INTERNATIONAL" + AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.3;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal" + PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_CONSOLE,GAMEBLENDER,WITH_QUICKTIME,INTERNATIONAL" BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="TRUE" - PrecompiledHeaderFile=".\..\..\..\obj\windows\blender\src\debug/BL_src.pch" - AssemblerListingLocation=".\..\..\..\obj\windows\blender\src\debug/" - ObjectFile=".\..\..\..\obj\windows\blender\src\debug/" - ProgramDataBaseFileName=".\..\..\..\obj\windows\blender\src\debug/" - WarningLevel="3" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\src\debug\BL_src.pch" + AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\src\debug\" + ObjectFile="..\..\..\..\build\msvc_7\source\blender\src\debug\" + ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\src\debug\" + WarningLevel="2" SuppressStartupBanner="TRUE" DebugInformationFormat="3" - CompileAs="0" - UndefinePreprocessorDefinitions="_DEBUG"/> + CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile=".\..\..\..\obj\windows\blender\src\debug\BL_src.lib" + OutputFile="..\..\..\..\build\msvc_7\libs\debug\BL_src.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -100,8 +107,15 @@ Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> + <Files> <Filter Name="Source Files" @@ -492,10 +506,10 @@ RelativePath="..\..\..\source\blender\include\BIF_writeavicodec.h"> </File> <File - RelativePath="..\..\..\source\blender\include\BSE_filesel.h"> + RelativePath="..\..\..\source\blender\include\blendef.h"> </File> <File - RelativePath="..\..\..\source\blender\include\blendef.h"> + RelativePath="..\..\..\source\blender\include\BSE_filesel.h"> </File> <File RelativePath="..\..\..\source\blender\include\butspace.h"> |