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 /intern/container
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 'intern/container')
-rw-r--r--intern/container/make/msvc_7_0/container.vcproj199
1 files changed, 168 insertions, 31 deletions
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 @@
-<?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="container"
SccProjectName=""
SccLocalPath="">
@@ -11,9 +11,9 @@
</Platforms>
<Configurations>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\..\..\..\..\obj\windows\intern\container"
- IntermediateDirectory=".\..\..\..\..\obj\windows\intern\container"
+ Name="Blender Release|Win32"
+ OutputDirectory="..\..\..\..\..\build\msvc_7\intern\container"
+ IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\container"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -26,26 +26,26 @@
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\..\..\..\..\obj\windows\intern\container/container.pch"
- AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\container/"
- ObjectFile=".\..\..\..\..\obj\windows\intern\container/"
- ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\container/"
- WarningLevel="1"
+ PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\container\container.pch"
+ AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\container\"
+ ObjectFile="..\..\..\..\..\build\msvc_7\intern\container\"
+ ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\container\"
+ WarningLevel="2"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="../../../../obj/windows/intern/container/libcontainer.lib"
+ OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libcontainer.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"
+ Description="Copying CTR files library to lib tree"
CommandLine="ECHO Copying header files
-XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\container\include\
-ECHO Copying lib
-XCOPY /Y ..\..\..\..\obj\windows\intern\container\*.lib ..\..\..\..\..\lib\windows\container\lib\*.lib
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\container\include MKDIR ..\..\..\..\..\build\msvc_7\intern\container\include
+XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\container\include
ECHO Done
"/>
<Tool
@@ -58,11 +58,17 @@ ECHO Done
Culture="1043"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\..\..\..\..\obj\windows\intern\container\debug"
- IntermediateDirectory=".\..\..\..\..\obj\windows\intern\container\debug"
+ Name="Blender Debug|Win32"
+ OutputDirectory="..\..\..\..\..\build\msvc_7\intern\container\debug"
+ IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\container\debug"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -73,30 +79,29 @@ ECHO Done
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ BufferSecurityCheck="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\..\..\..\..\obj\windows\intern\container\debug/container.pch"
- AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\container\debug/"
- ObjectFile=".\..\..\..\..\obj\windows\intern\container\debug/"
- ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\container\debug/"
- WarningLevel="1"
+ PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\container\debug\container.pch"
+ AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\container\debug\"
+ ObjectFile="..\..\..\..\..\build\msvc_7\intern\container\debug\"
+ ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\container\debug\"
+ WarningLevel="2"
SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\..\obj\windows\intern\container\debug\libcontainer.lib"
+ OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libcontainer.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"
+ Description="Copying CTR files library (debug target) to lib tree"
CommandLine="ECHO Copying header files
-XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\container\include\
-ECHO Copying lib
-XCOPY /Y ..\..\..\..\obj\windows\intern\container\debug\*.lib ..\..\..\..\..\lib\windows\container\lib\debug\*.lib
-ECHO Copying Debug info.
-XCOPY /Y ..\..\..\..\obj\windows\intern\container\debug\vc70.* ..\..\..\..\..\lib\windows\container\lib\debug\
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\container\include MKDIR ..\..\..\..\..\build\msvc_7\intern\container\include
+XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\container\include
ECHO Done
"/>
<Tool
@@ -109,8 +114,126 @@ ECHO Done
Culture="1043"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="3DPlugin Release|Win32"
+ OutputDirectory="..\..\..\..\..\build\msvc_7\intern\container\mtdll"
+ IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\container\mtdll"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="2"
+ PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\container\mtdll\container.pch"
+ AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\container\mtdll\"
+ ObjectFile="..\..\..\..\..\build\msvc_7\intern\container\mtdll\"
+ ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\container\mtdll\"
+ WarningLevel="2"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libcontainer.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Copying CTR files library to lib tree"
+ CommandLine="ECHO Copying header files
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\container\include MKDIR ..\..\..\..\..\build\msvc_7\intern\container\include
+XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\container\include
+ECHO Done
+"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1043"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="3DPlugin Debug|Win32"
+ OutputDirectory="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug"
+ IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug\container.pch"
+ AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug\"
+ ObjectFile="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug\"
+ ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug\"
+ WarningLevel="2"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libcontainer.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Copying CTR files library (debug target) to lib tree"
+ CommandLine="ECHO Copying header files
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\container\include MKDIR ..\..\..\..\..\build\msvc_7\intern\container\include
+XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\container\include
+ECHO Done
+"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1043"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+
<Files>
<Filter
Name="intern"
@@ -118,14 +241,28 @@ ECHO Done
<File
RelativePath="..\..\intern\CTR_List.cpp">
<FileConfiguration
- Name="Release|Win32">
+ Name="Blender Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="../extern,../../;$(NoInherit)"
+ CompileAs="0"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Blender Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="../../;$(NoInherit)"
+ CompileAs="0"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="3DPlugin Release|Win32">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../extern,../../;$(NoInherit)"
CompileAs="0"/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="3DPlugin Debug|Win32">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../;$(NoInherit)"