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
path: root/intern
diff options
context:
space:
mode:
authorJoseph Gilbert <ascotan@gmail.com>2005-02-12 05:06:52 +0300
committerJoseph Gilbert <ascotan@gmail.com>2005-02-12 05:06:52 +0300
commit5af05c961050b5367af04092181d0031dfb9abd9 (patch)
treee30a9a502479b6facb065cdf474bc095ad47dc63 /intern
parent39959b4f212664c492d068e798e1dfab8d11c571 (diff)
Update to the MSVC7 project files (vcproj) for Blender's internal libraries
- set build_install_all as the default project (if you give me a quarter ill tell you how :) - set SoundSystem to it's proper dependencies - updated those silly silly unix path separators - set project warning levels to something not so noisy
Diffstat (limited to 'intern')
-rw-r--r--intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj8
-rw-r--r--intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj8
-rw-r--r--intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj8
-rw-r--r--intern/bmfont/make/msvc_7_0/bmfont.vcproj8
-rw-r--r--intern/bsp/make/msvc_7_0/bsplib.vcproj14
-rw-r--r--intern/container/make/msvc_7_0/container.vcproj4
-rw-r--r--intern/decimation/make/msvc_7_0/decimation.vcproj14
-rw-r--r--intern/ghost/make/msvc_7_0/ghost.vcproj8
-rw-r--r--intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj4
-rw-r--r--intern/iksolver/make/msvc_7_0/iksolver.vcproj8
-rw-r--r--intern/keymaker/make/msvc_7_0/blenkey.vcproj8
-rw-r--r--intern/make/msvc_7_0/intern.sln5
-rw-r--r--intern/memutil/make/msvc_7_0/memutil.vcproj14
-rw-r--r--intern/moto/make/msvc_7_0/moto.vcproj26
-rw-r--r--intern/opennl/make/msvc_7_0/opennl.vcproj4
-rw-r--r--intern/string/make/msvc_7_0/string.vcproj8
16 files changed, 75 insertions, 74 deletions
diff --git a/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj b/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj
index f67e202cfe0..3ecf02c8b30 100644
--- a/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj
+++ b/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj
@@ -22,7 +22,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../,../../../../../lib/windows/string/include,../../../../../lib/windows/moto/include,../../dummy,../../openal"
+ AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\lib\windows\string\include;..\..\..\..\..\lib\windows\moto\include"
PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
@@ -31,7 +31,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\soundsystem\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\soundsystem\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\soundsystem\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
@@ -73,7 +73,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../,../../../../../lib/windows/string/include,../../../../../lib/windows/moto/include,../../dummy,../../openal"
+ AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\lib\windows\string\include;..\..\..\..\..\lib\windows\moto\include"
PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -84,7 +84,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\soundsystem/"
ObjectFile=".\..\..\..\..\obj\windows\intern\soundsystem/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\soundsystem/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
diff --git a/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj b/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj
index c52d3cc0252..78a3885527d 100644
--- a/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj
+++ b/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj
@@ -22,7 +22,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\intern,..\..\..\..\SoundSystem,..\..\..\..\moto\include,..\..\..\..\string"
+ AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\string;..\..\..\..\SoundSystem;..\..\..\..\moto\include"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -33,7 +33,7 @@
AssemblerListingLocation=".\..\..\..\..\..\obj\windows\intern\soundsystem\dummy/"
ObjectFile=".\..\..\..\..\..\obj\windows\intern\soundsystem\dummy/"
ProgramDataBaseFileName=".\..\..\..\..\..\obj\windows\intern\soundsystem\dummy/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
@@ -72,7 +72,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\intern,..\..\..\..\SoundSystem,..\..\..\..\moto\include,..\..\..\..\string"
+ AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\string;..\..\..\..\SoundSystem;..\..\..\..\moto\include"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
@@ -81,7 +81,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
diff --git a/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj b/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj
index 62fb91e3a72..83093403be6 100644
--- a/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj
+++ b/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj
@@ -22,7 +22,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\SoundSystem\sdl;..\..\..\..\SoundSystem;..\..\..\..\moto\include;..\..\..\..\string;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include"
+ AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\string;..\..\..\..\SoundSystem\sdl;..\..\..\..\SoundSystem;..\..\..\..\moto\include;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include"
PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
@@ -31,7 +31,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\soundsystem\openal\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\soundsystem\openal\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\soundsystem\openal\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
@@ -71,7 +71,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\SoundSystem\sdl;..\..\..\..\SoundSystem;..\..\..\..\moto\include;..\..\..\..\string;..\..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\..\lib\windows\sdl\include"
+ AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\string;..\..\..\..\SoundSystem\sdl;..\..\..\..\SoundSystem;..\..\..\..\moto\include;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include"
PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -82,7 +82,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\..\obj\windows\intern\soundsystem\openal/"
ObjectFile=".\..\..\..\..\..\obj\windows\intern\soundsystem\openal/"
ProgramDataBaseFileName=".\..\..\..\..\..\obj\windows\intern\soundsystem\openal/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
diff --git a/intern/bmfont/make/msvc_7_0/bmfont.vcproj b/intern/bmfont/make/msvc_7_0/bmfont.vcproj
index 348b364e9ed..fde39d8fb41 100644
--- a/intern/bmfont/make/msvc_7_0/bmfont.vcproj
+++ b/intern/bmfont/make/msvc_7_0/bmfont.vcproj
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../..,../../intern"
+ AdditionalIncludeDirectories="..\..;..\..\intern"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -31,7 +31,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\bmfont/"
ObjectFile=".\..\..\..\..\obj\windows\intern\bmfont/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\bmfont/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
@@ -73,7 +73,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../..,../../intern"
+ AdditionalIncludeDirectories="..\..;..\..\intern"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -82,7 +82,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\bmfont\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\bmfont\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\bmfont\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
diff --git a/intern/bsp/make/msvc_7_0/bsplib.vcproj b/intern/bsp/make/msvc_7_0/bsplib.vcproj
index 92aa4028a89..8895bdc0b45 100644
--- a/intern/bsp/make/msvc_7_0/bsplib.vcproj
+++ b/intern/bsp/make/msvc_7_0/bsplib.vcproj
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../../lib/windows/memutil,../..,../../../../../lib/windows/moto/include,../../../../../lib/windows/container/include,../../../../../lib/windows/memutil/include"
+ AdditionalIncludeDirectories="..\..;..\..\..\..\..\lib\windows\memutil;..\..\..\..\..\lib\windows\moto\include;..\..\..\..\..\lib\windows\container\include;..\..\..\..\..\lib\windows\memutil\include"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -29,7 +29,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\bsp\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\bsp\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\bsp\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
@@ -73,7 +73,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="../../../../../lib/windows/memutil/include,../..,../../../../../lib/windows/moto/include,../../../../../lib/windows/container/include"
+ AdditionalIncludeDirectories="..\..;..\..\..\..\..\lib\windows\memutil;..\..\..\..\..\lib\windows\moto\include;..\..\..\..\..\lib\windows\container\include;..\..\..\..\..\lib\windows\memutil\include"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -83,7 +83,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\bsp/"
ObjectFile=".\..\..\..\..\obj\windows\intern\bsp/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\bsp/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
@@ -137,6 +137,9 @@ ECHO Done
RelativePath="..\..\intern\BSP_CSGMesh.h">
</File>
<File
+ RelativePath="..\..\intern\BSP_CSGMesh_CFIterator.h">
+ </File>
+ <File
RelativePath="..\..\intern\BSP_CSGMeshBuilder.cpp">
</File>
<File
@@ -149,9 +152,6 @@ ECHO Done
RelativePath="..\..\intern\BSP_CSGMeshSplitter.h">
</File>
<File
- RelativePath="..\..\intern\BSP_CSGMesh_CFIterator.h">
- </File>
- <File
RelativePath="..\..\intern\BSP_CSGNCMeshSplitter.cpp">
</File>
<File
diff --git a/intern/container/make/msvc_7_0/container.vcproj b/intern/container/make/msvc_7_0/container.vcproj
index 9dcce2529e0..acbc55cc1bf 100644
--- a/intern/container/make/msvc_7_0/container.vcproj
+++ b/intern/container/make/msvc_7_0/container.vcproj
@@ -30,7 +30,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\container/"
ObjectFile=".\..\..\..\..\obj\windows\intern\container/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\container/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -78,7 +78,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\container\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\container\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\container\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"/>
<Tool
diff --git a/intern/decimation/make/msvc_7_0/decimation.vcproj b/intern/decimation/make/msvc_7_0/decimation.vcproj
index 11db67b3512..e7af4f24697 100644
--- a/intern/decimation/make/msvc_7_0/decimation.vcproj
+++ b/intern/decimation/make/msvc_7_0/decimation.vcproj
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\container\include\,..\..\..\..\..\lib\windows\memutil\include\,..\..\..\..\..\lib\windows\moto\include\"
+ AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\moto\include\;..\..\..\..\..\lib\windows\container\include\;..\..\..\..\..\lib\windows\memutil\include\"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
@@ -29,7 +29,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\decimation\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\decimation\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\decimation\debug/"
- WarningLevel="4"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
@@ -73,7 +73,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\container\include\,..\..\..\..\..\lib\windows\memutil\include\,..\..\..\..\..\lib\windows\moto\include\"
+ AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\moto\include\;..\..\..\..\..\lib\windows\container\include\;..\..\..\..\..\lib\windows\memutil\include\"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="TRUE"
RuntimeLibrary="4"
@@ -82,7 +82,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\decimation/"
ObjectFile=".\..\..\..\..\obj\windows\intern\decimation/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\decimation/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
@@ -118,6 +118,9 @@ ECHO Done
Name="intern"
Filter="">
<File
+ RelativePath="..\..\intern\LOD_decimation.cpp">
+ </File>
+ <File
RelativePath="..\..\intern\LOD_DecimationClass.h">
</File>
<File
@@ -174,9 +177,6 @@ ECHO Done
<File
RelativePath="..\..\intern\LOD_QuadricEditor.h">
</File>
- <File
- RelativePath="..\..\intern\LOD_decimation.cpp">
- </File>
</Filter>
<Filter
Name="extern"
diff --git a/intern/ghost/make/msvc_7_0/ghost.vcproj b/intern/ghost/make/msvc_7_0/ghost.vcproj
index e5be5a4e0e8..f287cab7a08 100644
--- a/intern/ghost/make/msvc_7_0/ghost.vcproj
+++ b/intern/ghost/make/msvc_7_0/ghost.vcproj
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../..,../../../../../lib/windows/string/include"
+ AdditionalIncludeDirectories="..\..;..\..\..\..\..\lib\windows\string\include"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -31,7 +31,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\ghost/"
ObjectFile=".\..\..\..\..\obj\windows\intern\ghost/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\ghost/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
@@ -73,7 +73,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../..,../../../../../lib/windows/string/include"
+ AdditionalIncludeDirectories="..\..;..\..\..\..\..\lib\windows\string\include"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -83,7 +83,7 @@ ECHO Done
ObjectFile=".\..\..\..\..\obj\windows\intern\ghost\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\ghost\debug/"
BrowseInformation="1"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
diff --git a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj b/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
index 2f001ffe8f0..65abe35dc0c 100644
--- a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
+++ b/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
@@ -32,7 +32,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\guardedalloc/"
ObjectFile=".\..\..\..\..\obj\windows\intern\guardedalloc/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\guardedalloc/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
@@ -82,7 +82,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\guardedalloc\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\guardedalloc\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\guardedalloc\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
diff --git a/intern/iksolver/make/msvc_7_0/iksolver.vcproj b/intern/iksolver/make/msvc_7_0/iksolver.vcproj
index bfaade8282b..a617469b7d3 100644
--- a/intern/iksolver/make/msvc_7_0/iksolver.vcproj
+++ b/intern/iksolver/make/msvc_7_0/iksolver.vcproj
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\..\intern\moto\include,..\..\..\..\intern\memutil"
+ AdditionalIncludeDirectories="..\..\..\..\intern\memutil;..\..\..\..\intern\moto\include"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="TRUE"
RuntimeLibrary="4"
@@ -30,7 +30,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\iksolver/"
ObjectFile=".\..\..\..\..\obj\windows\intern\iksolver/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\iksolver/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
@@ -71,7 +71,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\intern\moto\include,..\..\..\..\intern\memutil"
+ AdditionalIncludeDirectories="..\..\..\..\intern\memutil;..\..\..\..\intern\moto\include"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
@@ -79,7 +79,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\iksolver\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\iksolver\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\iksolver\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
diff --git a/intern/keymaker/make/msvc_7_0/blenkey.vcproj b/intern/keymaker/make/msvc_7_0/blenkey.vcproj
index d2d67a29201..4352b5f51dd 100644
--- a/intern/keymaker/make/msvc_7_0/blenkey.vcproj
+++ b/intern/keymaker/make/msvc_7_0/blenkey.vcproj
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\lib\windows\openssl\include;..\..\python"
+ AdditionalIncludeDirectories="..\..;..\..\python;..\..\..\..\..\lib\windows\openssl\include"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
@@ -30,7 +30,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\blenkey\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\blenkey\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\blenkey\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
@@ -71,7 +71,7 @@ XCOPY /Y ..\..\..\..\obj\windows\intern\blenkey\debug\*.lib ..\..\..\..\..\lib\w
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\lib\windows\openssl\include;..\..\python"
+ AdditionalIncludeDirectories="..\..;..\..\python;..\..\..\..\..\lib\windows\openssl\include"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="TRUE"
RuntimeLibrary="4"
@@ -81,7 +81,7 @@ XCOPY /Y ..\..\..\..\obj\windows\intern\blenkey\debug\*.lib ..\..\..\..\..\lib\w
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\blenkey/"
ObjectFile=".\..\..\..\..\obj\windows\intern\blenkey/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\blenkey/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
diff --git a/intern/make/msvc_7_0/intern.sln b/intern/make/msvc_7_0/intern.sln
index 3d229d84768..bdeb90481c8 100644
--- a/intern/make/msvc_7_0/intern.sln
+++ b/intern/make/msvc_7_0/intern.sln
@@ -1,4 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoTo", "..\..\moto\make\msvc_7_0\MoTo.vcproj", "{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blenkey", "..\..\keymaker\make\msvc_7_0\blenkey.vcproj", "{121EC196-8E8A-4937-B0BD-0F114C87D55E}"
@@ -7,8 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmfont", "..\..\bmfont\make
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsplib", "..\..\bsp\make\msvc_7_0\bsplib.vcproj", "{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "container", "..\..\container\make\msvc_7_0\container.vcproj", "{51A348C1-8684-4D67-B980-97B1FC74159B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decimation", "..\..\decimation\make\msvc_7_0\decimation.vcproj", "{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}"
@@ -61,6 +61,7 @@ Global
{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.0 = {B789C2F3-279E-4A85-8F0A-7F7AC068E598}
{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.0 = {B789C2F3-279E-4A85-8F0A-7F7AC068E598}
{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.1 = {6B3229F4-2A37-47EE-8B89-9AA046B35193}
+ {98330220-47A6-42E0-9DE4-AD0FF5D204D6}.2 = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
{213356A9-3A1F-41DA-9819-1297BCD17DEE}.0 = {98330220-47A6-42E0-9DE4-AD0FF5D204D6}
{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.0 = {98330220-47A6-42E0-9DE4-AD0FF5D204D6}
EndGlobalSection
diff --git a/intern/memutil/make/msvc_7_0/memutil.vcproj b/intern/memutil/make/msvc_7_0/memutil.vcproj
index e196af7510d..9ac97fc9279 100644
--- a/intern/memutil/make/msvc_7_0/memutil.vcproj
+++ b/intern/memutil/make/msvc_7_0/memutil.vcproj
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../.."
+ AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -30,7 +30,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\memutil\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\memutil\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\memutil\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
@@ -74,7 +74,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="../.."
+ AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -84,7 +84,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\memutil/"
ObjectFile=".\..\..\..\..\obj\windows\intern\memutil/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\memutil/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
@@ -133,15 +133,15 @@ ECHO Done
RelativePath="..\..\MEM_NonCopyable.h">
</File>
<File
- RelativePath="..\..\MEM_RefCountPtr.h">
- </File>
- <File
RelativePath="..\..\MEM_RefCounted.h">
</File>
<File
RelativePath="..\..\MEM_RefCountedC-Api.h">
</File>
<File
+ RelativePath="..\..\MEM_RefCountPtr.h">
+ </File>
+ <File
RelativePath="..\..\MEM_SmartPtr.h">
</File>
</Filter>
diff --git a/intern/moto/make/msvc_7_0/moto.vcproj b/intern/moto/make/msvc_7_0/moto.vcproj
index 1ac53ffbe07..a9e4414fe75 100644
--- a/intern/moto/make/msvc_7_0/moto.vcproj
+++ b/intern/moto/make/msvc_7_0/moto.vcproj
@@ -30,7 +30,7 @@
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\moto/"
ObjectFile=".\..\..\..\..\obj\windows\intern\moto/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\moto/"
- WarningLevel="4"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
@@ -79,7 +79,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\moto\debug/"
ObjectFile=".\..\..\..\..\obj\windows\intern\moto\debug/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\moto\debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
@@ -177,7 +177,7 @@ ECHO Done
</FileConfiguration>
</File>
<File
- RelativePath="..\..\intern\MT_Transform.cpp">
+ RelativePath="..\..\intern\MT_random.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
@@ -187,7 +187,7 @@ ECHO Done
</FileConfiguration>
</File>
<File
- RelativePath="..\..\intern\MT_Vector2.cpp">
+ RelativePath="..\..\intern\MT_Transform.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
@@ -197,7 +197,7 @@ ECHO Done
</FileConfiguration>
</File>
<File
- RelativePath="..\..\intern\MT_Vector3.cpp">
+ RelativePath="..\..\intern\MT_Vector2.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
@@ -207,7 +207,7 @@ ECHO Done
</FileConfiguration>
</File>
<File
- RelativePath="..\..\intern\MT_Vector4.cpp">
+ RelativePath="..\..\intern\MT_Vector3.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
@@ -217,7 +217,7 @@ ECHO Done
</FileConfiguration>
</File>
<File
- RelativePath="..\..\intern\MT_random.cpp">
+ RelativePath="..\..\intern\MT_Vector4.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
@@ -237,6 +237,9 @@ ECHO Done
RelativePath="..\..\include\GEN_Map.h">
</File>
<File
+ RelativePath="..\..\include\MT_assert.h">
+ </File>
+ <File
RelativePath="..\..\include\MT_CmMatrix4x4.h">
</File>
<File
@@ -264,6 +267,9 @@ ECHO Done
RelativePath="..\..\include\MT_Quaternion.h">
</File>
<File
+ RelativePath="..\..\include\MT_random.h">
+ </File>
+ <File
RelativePath="..\..\include\MT_Scalar.h">
</File>
<File
@@ -291,12 +297,6 @@ ECHO Done
RelativePath="..\..\include\MT_Vector4.h">
</File>
<File
- RelativePath="..\..\include\MT_assert.h">
- </File>
- <File
- RelativePath="..\..\include\MT_random.h">
- </File>
- <File
RelativePath="..\..\include\NM_Scalar.h">
</File>
<Filter
diff --git a/intern/opennl/make/msvc_7_0/opennl.vcproj b/intern/opennl/make/msvc_7_0/opennl.vcproj
index f601f8abaaf..afe396e6ab3 100644
--- a/intern/opennl/make/msvc_7_0/opennl.vcproj
+++ b/intern/opennl/make/msvc_7_0/opennl.vcproj
@@ -26,7 +26,7 @@
RuntimeLibrary="1"
BufferSecurityCheck="TRUE"
UsePrecompiledHeader="0"
- WarningLevel="3"
+ WarningLevel="1"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/>
<Tool
@@ -72,7 +72,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\opennl\"
ObjectFile=".\..\..\..\..\obj\windows\intern\opennl"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\opennl\"
- WarningLevel="3"
+ WarningLevel="1"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
CompileAs="1"/>
diff --git a/intern/string/make/msvc_7_0/string.vcproj b/intern/string/make/msvc_7_0/string.vcproj
index adddfa96feb..d105112905f 100644
--- a/intern/string/make/msvc_7_0/string.vcproj
+++ b/intern/string/make/msvc_7_0/string.vcproj
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../.."
+ AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -30,7 +30,7 @@
AssemblerListingLocation=".\../../../../obj/windows/intern/string/debug/"
ObjectFile=".\../../../../obj/windows/intern/string/debug/"
ProgramDataBaseFileName=".\../../../../obj/windows/intern/string/debug/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
@@ -72,7 +72,7 @@ ECHO Done
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../.."
+ AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -82,7 +82,7 @@ ECHO Done
AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\string/"
ObjectFile=".\..\..\..\..\obj\windows\intern\string/"
ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\string/"
- WarningLevel="3"
+ WarningLevel="1"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool