From 61767b4f483613f4060524abd9cb7e74aae355ea Mon Sep 17 00:00:00 2001 From: Joseph Gilbert Date: Sun, 20 Feb 2005 21:33:11 +0000 Subject: 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 - --- intern/container/make/msvc_7_0/container.vcproj | 199 ++++++++++++++++++++---- 1 file changed, 168 insertions(+), 31 deletions(-) (limited to 'intern/container') diff --git a/intern/container/make/msvc_7_0/container.vcproj b/intern/container/make/msvc_7_0/container.vcproj index acbc55cc1bf..db346026c91 100644 --- a/intern/container/make/msvc_7_0/container.vcproj +++ b/intern/container/make/msvc_7_0/container.vcproj @@ -1,7 +1,7 @@ - + @@ -11,9 +11,9 @@ + + + + DebugInformationFormat="3"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Name="Blender Release|Win32"> + + + + + + + Name="3DPlugin Debug|Win32">