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 - --- extern/make/msvc_7_0/build_install_all.vcproj | 84 ++++++++++++++++++ extern/make/msvc_7_0/extern.sln | 118 ++++++++++++++++++++++++++ 2 files changed, 202 insertions(+) create mode 100644 extern/make/msvc_7_0/build_install_all.vcproj create mode 100644 extern/make/msvc_7_0/extern.sln (limited to 'extern/make') diff --git a/extern/make/msvc_7_0/build_install_all.vcproj b/extern/make/msvc_7_0/build_install_all.vcproj new file mode 100644 index 00000000000..334acec91c2 --- /dev/null +++ b/extern/make/msvc_7_0/build_install_all.vcproj @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extern/make/msvc_7_0/extern.sln b/extern/make/msvc_7_0/extern.sln new file mode 100644 index 00000000000..51d1dd63cc6 --- /dev/null +++ b/extern/make/msvc_7_0/extern.sln @@ -0,0 +1,118 @@ +Microsoft Visual Studio Solution File, Format Version 7.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{9C71A793-C177-4CAB-8EC5-923D500B39F8}" + ProjectSection(ProjectDependencies) = postProject + {F9850C15-FF0A-429E-9D47-89FB433C9BD8} = {F9850C15-FF0A-429E-9D47-89FB433C9BD8} + {D696C86B-0B53-4471-A50D-5B983A6FA4AD} = {D696C86B-0B53-4471-A50D-5B983A6FA4AD} + {393260B1-035A-45B9-85CF-1E7BE459AAF4} = {393260B1-035A-45B9-85CF-1E7BE459AAF4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "solid", "..\..\solid\make\msvc_7_0\solid.vcproj", "{D696C86B-0B53-4471-A50D-5B983A6FA4AD}" + ProjectSection(ProjectDependencies) = postProject + {6461F05D-4698-47AB-A8E8-1CA2ACC9948B} = {6461F05D-4698-47AB-A8E8-1CA2ACC9948B} + {0112CAD5-3584-412A-A2E5-1315A00437B4} = {0112CAD5-3584-412A-A2E5-1315A00437B4} + {B83C6BED-11EC-46C8-AFFA-121EEDE94373} = {B83C6BED-11EC-46C8-AFFA-121EEDE94373} + {524264F4-DF21-4B79-847F-E7CA643ECD0B} = {524264F4-DF21-4B79-847F-E7CA643ECD0B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qhull", "..\..\qhull\make\msvc_7_0\qhull.vcproj", "{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convex", "..\..\solid\make\msvc_7_0\convex\convex.vcproj", "{524264F4-DF21-4B79-847F-E7CA643ECD0B}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complex", "..\..\solid\make\msvc_7_0\complex\complex.vcproj", "{B83C6BED-11EC-46C8-AFFA-121EEDE94373}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broad", "..\..\solid\make\msvc_7_0\broad\broad.vcproj", "{0112CAD5-3584-412A-A2E5-1315A00437B4}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftgl_static_lib", "..\..\bFTGL\make\msvc_7_0\ftgl_static_lib.vcproj", "{F9850C15-FF0A-429E-9D47-89FB433C9BD8}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\freetype\make\msvc_7_0\freetype.vcproj", "{393260B1-035A-45B9-85CF-1E7BE459AAF4}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + 3D Plugin Debug = 3D Plugin Debug + 3D Plugin Release = 3D Plugin Release + Blender Debug = Blender Debug + Blender Release = Blender Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {9C71A793-C177-4CAB-8EC5-923D500B39F8}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 + {9C71A793-C177-4CAB-8EC5-923D500B39F8}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 + {9C71A793-C177-4CAB-8EC5-923D500B39F8}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 + {9C71A793-C177-4CAB-8EC5-923D500B39F8}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 + {9C71A793-C177-4CAB-8EC5-923D500B39F8}.Blender Debug.ActiveCfg = Blender Debug|Win32 + {9C71A793-C177-4CAB-8EC5-923D500B39F8}.Blender Debug.Build.0 = Blender Debug|Win32 + {9C71A793-C177-4CAB-8EC5-923D500B39F8}.Blender Release.ActiveCfg = Blender Release|Win32 + {9C71A793-C177-4CAB-8EC5-923D500B39F8}.Blender Release.Build.0 = Blender Release|Win32 + {D696C86B-0B53-4471-A50D-5B983A6FA4AD}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 + {D696C86B-0B53-4471-A50D-5B983A6FA4AD}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 + {D696C86B-0B53-4471-A50D-5B983A6FA4AD}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 + {D696C86B-0B53-4471-A50D-5B983A6FA4AD}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 + {D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Blender Debug.ActiveCfg = Blender Debug|Win32 + {D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Blender Debug.Build.0 = Blender Debug|Win32 + {D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Blender Release.ActiveCfg = Blender Release|Win32 + {D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Blender Release.Build.0 = Blender Release|Win32 + {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 + {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 + {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 + {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 + {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Blender Debug.ActiveCfg = Blender Debug|Win32 + {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Blender Debug.Build.0 = Blender Debug|Win32 + {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Blender Release.ActiveCfg = Blender Release|Win32 + {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Blender Release.Build.0 = Blender Release|Win32 + {524264F4-DF21-4B79-847F-E7CA643ECD0B}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 + {524264F4-DF21-4B79-847F-E7CA643ECD0B}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 + {524264F4-DF21-4B79-847F-E7CA643ECD0B}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 + {524264F4-DF21-4B79-847F-E7CA643ECD0B}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 + {524264F4-DF21-4B79-847F-E7CA643ECD0B}.Blender Debug.ActiveCfg = Blender Debug|Win32 + {524264F4-DF21-4B79-847F-E7CA643ECD0B}.Blender Debug.Build.0 = Blender Debug|Win32 + {524264F4-DF21-4B79-847F-E7CA643ECD0B}.Blender Release.ActiveCfg = Blender Release|Win32 + {524264F4-DF21-4B79-847F-E7CA643ECD0B}.Blender Release.Build.0 = Blender Release|Win32 + {B83C6BED-11EC-46C8-AFFA-121EEDE94373}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 + {B83C6BED-11EC-46C8-AFFA-121EEDE94373}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 + {B83C6BED-11EC-46C8-AFFA-121EEDE94373}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 + {B83C6BED-11EC-46C8-AFFA-121EEDE94373}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 + {B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Blender Debug.ActiveCfg = Blender Debug|Win32 + {B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Blender Debug.Build.0 = Blender Debug|Win32 + {B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Blender Release.ActiveCfg = Blender Release|Win32 + {B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Blender Release.Build.0 = Blender Release|Win32 + {0112CAD5-3584-412A-A2E5-1315A00437B4}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 + {0112CAD5-3584-412A-A2E5-1315A00437B4}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 + {0112CAD5-3584-412A-A2E5-1315A00437B4}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 + {0112CAD5-3584-412A-A2E5-1315A00437B4}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 + {0112CAD5-3584-412A-A2E5-1315A00437B4}.Blender Debug.ActiveCfg = Blender Debug|Win32 + {0112CAD5-3584-412A-A2E5-1315A00437B4}.Blender Debug.Build.0 = Blender Debug|Win32 + {0112CAD5-3584-412A-A2E5-1315A00437B4}.Blender Release.ActiveCfg = Blender Release|Win32 + {0112CAD5-3584-412A-A2E5-1315A00437B4}.Blender Release.Build.0 = Blender Release|Win32 + {F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 + {F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 + {F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 + {F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 + {F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Blender Debug.ActiveCfg = Blender Debug|Win32 + {F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Blender Debug.Build.0 = Blender Debug|Win32 + {F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Blender Release.ActiveCfg = Blender Release|Win32 + {F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Blender Release.Build.0 = Blender Release|Win32 + {393260B1-035A-45B9-85CF-1E7BE459AAF4}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32 + {393260B1-035A-45B9-85CF-1E7BE459AAF4}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32 + {393260B1-035A-45B9-85CF-1E7BE459AAF4}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32 + {393260B1-035A-45B9-85CF-1E7BE459AAF4}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32 + {393260B1-035A-45B9-85CF-1E7BE459AAF4}.Blender Debug.ActiveCfg = Blender Debug|Win32 + {393260B1-035A-45B9-85CF-1E7BE459AAF4}.Blender Debug.Build.0 = Blender Debug|Win32 + {393260B1-035A-45B9-85CF-1E7BE459AAF4}.Blender Release.ActiveCfg = Blender Release|Win32 + {393260B1-035A-45B9-85CF-1E7BE459AAF4}.Blender Release.Build.0 = Blender Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal -- cgit v1.2.3