diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2004-01-03 02:35:21 +0300 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2004-01-03 02:35:21 +0300 |
| commit | 7303944ea97bc7bfd25e59be790e2e194f0f5551 (patch) | |
| tree | c504b3a0d8f6e64a23fe3919f04516eb40ac1bed /make | |
| parent | a5a01ed549b837596790a917d11983e93f381c1b (diff) | |
- update VC7 projectfiles
Diffstat (limited to 'make')
53 files changed, 492 insertions, 297 deletions
diff --git a/make/msvc_7_0/blender/BLO_decrypt/BLO_decrypt.vcproj b/make/msvc_7_0/blender/BLO_decrypt/BLO_decrypt.vcproj index 1afe393ca35..023071376a2 100644 --- a/make/msvc_7_0/blender/BLO_decrypt/BLO_decrypt.vcproj +++ b/make/msvc_7_0/blender/BLO_decrypt/BLO_decrypt.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestream,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\keymaker,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestream,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\keymaker,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -66,7 +66,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\keymaker,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\keymaker,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -111,7 +111,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestream,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\keymaker,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestream,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\keymaker,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -156,7 +156,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestream,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\keymaker,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestream,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\keymaker,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/blender/BLO_deflate/BLO_deflate.vcproj b/make/msvc_7_0/blender/BLO_deflate/BLO_deflate.vcproj index f45daf295ca..d5dd0e282d9 100644 --- a/make/msvc_7_0/blender/BLO_deflate/BLO_deflate.vcproj +++ b/make/msvc_7_0/blender/BLO_deflate/BLO_deflate.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\deflate\;$(SolutionDir)source\blender\inflate\;$(SolutionDir)lib\windows\zlib\include;$(SolutionDir)source\blender\writestreamglue;$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\deflate\;$(SolutionDir)source\blender\inflate\;$(SolutionDir)..\lib\windows\zlib\include;$(SolutionDir)source\blender\writestreamglue;$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/blender/BLO_deflate_stub/BLO_deflate_stub.vcproj b/make/msvc_7_0/blender/BLO_deflate_stub/BLO_deflate_stub.vcproj index b66cb0679e4..309b6c21ef7 100644 --- a/make/msvc_7_0/blender/BLO_deflate_stub/BLO_deflate_stub.vcproj +++ b/make/msvc_7_0/blender/BLO_deflate_stub/BLO_deflate_stub.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\deflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\streamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\deflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\streamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="4" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\deflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\streamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\deflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\streamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\deflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\streamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\deflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\streamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\deflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\streamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\deflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\streamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="5" diff --git a/make/msvc_7_0/blender/BLO_encrypt/BLO_encrypt.vcproj b/make/msvc_7_0/blender/BLO_encrypt/BLO_encrypt.vcproj index 606cd90b00b..3dce8d3b446 100644 --- a/make/msvc_7_0/blender/BLO_encrypt/BLO_encrypt.vcproj +++ b/make/msvc_7_0/blender/BLO_encrypt/BLO_encrypt.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\decrypt" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\decrypt" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\decrypt" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\decrypt" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\writestreamglue;$(SolutionDir)source\blender\encrypt;$(SolutionDir)source\blender\readstreamglue;$(SolutionDir)lib\windows\openssl\include;$(SolutionDir)lib\windows\zlib\include;$(SolutionDir)intern\keymaker;$(SolutionDir)source\blender\decrypt" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\writestreamglue;$(SolutionDir)source\blender\encrypt;$(SolutionDir)source\blender\readstreamglue;$(SolutionDir)..\lib\windows\openssl\include;$(SolutionDir)..\lib\windows\zlib\include;$(SolutionDir)intern\keymaker;$(SolutionDir)source\blender\decrypt" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\decrypt" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\decrypt" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/blender/BLO_inflate/BLO_inflate.vcproj b/make/msvc_7_0/blender/BLO_inflate/BLO_inflate.vcproj index daa4df5ac91..eee8fe177e2 100644 --- a/make/msvc_7_0/blender/BLO_inflate/BLO_inflate.vcproj +++ b/make/msvc_7_0/blender/BLO_inflate/BLO_inflate.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\inflate;$(SolutionDir)lib\windows\zlib\include;$(SolutionDir)source\blender\readstreamglue;$(SolutionDir)source\blender\writestreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\inflate;$(SolutionDir)..\lib\windows\zlib\include;$(SolutionDir)source\blender\readstreamglue;$(SolutionDir)source\blender\writestreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\inflate,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\inflate,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\inflate,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\inflate,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\inflate,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\inflate,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" diff --git a/make/msvc_7_0/blender/BLO_readblenfile/BLO_readblenfile.vcproj b/make/msvc_7_0/blender/BLO_readblenfile/BLO_readblenfile.vcproj index 2fe822741cc..ac307b15ed1 100644 --- a/make/msvc_7_0/blender/BLO_readblenfile/BLO_readblenfile.vcproj +++ b/make/msvc_7_0/blender/BLO_readblenfile/BLO_readblenfile.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\readstreamglue\;$(SolutionDir)source\blender\blenloader\;$(SolutionDir)source\blender\makesdna;$(SolutionDir)source\blender\blenkernel;$(SolutionDir)source\blender\blenlib;$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\readblenfile\;$(SolutionDir)source\blender\deflate\;$(SolutionDir)source\blender\inflate\;$(SolutionDir)lib\windows\zlib\include;$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\readstreamglue\;$(SolutionDir)source\blender\blenloader\;$(SolutionDir)source\blender\makesdna;$(SolutionDir)source\blender\blenkernel;$(SolutionDir)source\blender\blenlib;$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\readblenfile\;$(SolutionDir)source\blender\deflate\;$(SolutionDir)source\blender\inflate\;$(SolutionDir)..\lib\windows\zlib\include;$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\readstreamglue\,$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\readstreamglue\,$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/blender/BLO_readblenfile_stub/BLO_readblenfile_stub.vcproj b/make/msvc_7_0/blender/BLO_readblenfile_stub/BLO_readblenfile_stub.vcproj index c45855a6a57..4ec233df298 100644 --- a/make/msvc_7_0/blender/BLO_readblenfile_stub/BLO_readblenfile_stub.vcproj +++ b/make/msvc_7_0/blender/BLO_readblenfile_stub/BLO_readblenfile_stub.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="4" diff --git a/make/msvc_7_0/blender/BLO_readstreamglue/BLO_readstreamglue.vcproj b/make/msvc_7_0/blender/BLO_readstreamglue/BLO_readstreamglue.vcproj index 50995669be9..43ce43f4889 100644 --- a/make/msvc_7_0/blender/BLO_readstreamglue/BLO_readstreamglue.vcproj +++ b/make/msvc_7_0/blender/BLO_readstreamglue/BLO_readstreamglue.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\readstreamglue\stubs,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\inflate,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\verify,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\readstreamglue\stubs,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\inflate,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\verify,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\readstreamglue\stubs,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\inflate,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\verify,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\readstreamglue\stubs,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\inflate,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\verify,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\readstreamglue\stubs,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\inflate,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\verify,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\readstreamglue\stubs,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\inflate,$(SolutionDir)source\blender\decrypt,$(SolutionDir)source\blender\verify,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\readstreamglue;$(SolutionDir)source\blender\readstreamglue\stubs;$(SolutionDir)lib\windows\zlib\include;$(SolutionDir)source\blender\blenloader;$(SolutionDir)source\blender\inflate;$(SolutionDir)source\blender\decrypt;$(SolutionDir)source\blender\verify;$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\readstreamglue;$(SolutionDir)source\blender\readstreamglue\stubs;$(SolutionDir)..\lib\windows\zlib\include;$(SolutionDir)source\blender\blenloader;$(SolutionDir)source\blender\inflate;$(SolutionDir)source\blender\decrypt;$(SolutionDir)source\blender\verify;$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -197,9 +197,6 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="$(SolutionDir)source\blender\readstreamglue\intern\BLO_keyStore.c"> - </File> - <File RelativePath="$(SolutionDir)source\blender\readstreamglue\intern\BLO_readStreamGlue.c"> </File> <File diff --git a/make/msvc_7_0/blender/BLO_sign/BLO_sign.vcproj b/make/msvc_7_0/blender/BLO_sign/BLO_sign.vcproj index cefc84416f0..9ad444ea09f 100644 --- a/make/msvc_7_0/blender/BLO_sign/BLO_sign.vcproj +++ b/make/msvc_7_0/blender/BLO_sign/BLO_sign.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)lib\windows\zlib\include";"$(SolutionDir)lib\windows\openssl\include";"$(SolutionDir)intern\keymaker";"$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\blender\sign";"$(SolutionDir)source\blender\verify";"$(SolutionDir)source\blender\writestreamglue"" + AdditionalIncludeDirectories=""$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)..\lib\windows\zlib\include";"$(SolutionDir)..\lib\windows\openssl\include";"$(SolutionDir)intern\keymaker";"$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\blender\sign";"$(SolutionDir)source\blender\verify";"$(SolutionDir)source\blender\writestreamglue"" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\writestreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\writestreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\writestreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\writestreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\writestreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)intern\keymaker,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\writestreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/blender/BLO_streamglue_stub/BLO_streamglue_stub.vcproj b/make/msvc_7_0/blender/BLO_streamglue_stub/BLO_streamglue_stub.vcproj index f9daac0d0d4..ec4a3b4d071 100644 --- a/make/msvc_7_0/blender/BLO_streamglue_stub/BLO_streamglue_stub.vcproj +++ b/make/msvc_7_0/blender/BLO_streamglue_stub/BLO_streamglue_stub.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="4" diff --git a/make/msvc_7_0/blender/BLO_verify/BLO_verify.vcproj b/make/msvc_7_0/blender/BLO_verify/BLO_verify.vcproj index 04316238cbb..1b5b77c7e56 100644 --- a/make/msvc_7_0/blender/BLO_verify/BLO_verify.vcproj +++ b/make/msvc_7_0/blender/BLO_verify/BLO_verify.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\openssl\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\openssl\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" diff --git a/make/msvc_7_0/blender/BLO_writeblenfile/BLO_writeblenfile.vcproj b/make/msvc_7_0/blender/BLO_writeblenfile/BLO_writeblenfile.vcproj index 7ff03ad2978..ab5372d857b 100644 --- a/make/msvc_7_0/blender/BLO_writeblenfile/BLO_writeblenfile.vcproj +++ b/make/msvc_7_0/blender/BLO_writeblenfile/BLO_writeblenfile.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestreamglue\,$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\writestreamglue\,$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\blenloader\,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/make/msvc_7_0/blender/BLO_writestreamglue/BLO_writestreamglue.vcproj b/make/msvc_7_0/blender/BLO_writestreamglue/BLO_writestreamglue.vcproj index 36b4ad6ccdb..24e4b7d93ca 100644 --- a/make/msvc_7_0/blender/BLO_writestreamglue/BLO_writestreamglue.vcproj +++ b/make/msvc_7_0/blender/BLO_writestreamglue/BLO_writestreamglue.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" diff --git a/make/msvc_7_0/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.vcproj b/make/msvc_7_0/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.vcproj index 3dc9c26c936..dfecdcea8fb 100644 --- a/make/msvc_7_0/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.vcproj +++ b/make/msvc_7_0/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\deflate,$(SolutionDir)source\blender\encrypt,$(SolutionDir)source\blender\sign,$(SolutionDir)source\blender\writeblenfile,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/blender/FTF_ttfont/FTF_ttfont.vcproj b/make/msvc_7_0/blender/FTF_ttfont/FTF_ttfont.vcproj index 415302bb5bf..668d18a85e0 100644 --- a/make/msvc_7_0/blender/FTF_ttfont/FTF_ttfont.vcproj +++ b/make/msvc_7_0/blender/FTF_ttfont/FTF_ttfont.vcproj @@ -19,7 +19,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)lib\windows\gettext\include";"$(SolutionDir)lib\windows\freetype\include";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\ftfont";"$(SolutionDir)source\blender\ftfont\intern";"$(SolutionDir)lib\windows\ftgl\include"" + AdditionalIncludeDirectories=""$(SolutionDir)..\lib\windows\gettext\include";"$(SolutionDir)..\lib\windows\freetype\include";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\ftfont";"$(SolutionDir)source\blender\ftfont\intern";"$(SolutionDir)..\lib\windows\ftgl\include"" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;INTERNATIONAL" MinimalRebuild="TRUE" BasicRuntimeChecks="3" @@ -32,7 +32,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\ftfont\lib\debug\FTF_ttfont.lib"/> + OutputFile="$(SolutionDir)..\lib\windows\ftfont\lib\debug\FTF_ttfont.lib"/> <Tool Name="VCMIDLTool"/> <Tool @@ -57,7 +57,7 @@ Optimization="2" InlineFunctionExpansion="1" OmitFramePointers="TRUE" - AdditionalIncludeDirectories=""$(SolutionDir)lib\windows\gettext\include";"$(SolutionDir)lib\windows\freetype\include";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\ftfont";"$(SolutionDir)source\blender\ftfont\intern";"$(SolutionDir)lib\windows\ftgl\include"" + AdditionalIncludeDirectories=""$(SolutionDir)..\lib\windows\gettext\include";"$(SolutionDir)..\lib\windows\freetype\include";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\ftfont";"$(SolutionDir)source\blender\ftfont\intern";"$(SolutionDir)..\lib\windows\ftgl\include"" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_WIN32;INTERNATIONAL;WCHAR_T16" StringPooling="TRUE" RuntimeLibrary="4" @@ -70,7 +70,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)\lib\windows\ftfont\lib\FTF_ttfont.lib" + OutputFile="$(SolutionDir)..\lib\windows\ftfont\lib\FTF_ttfont.lib" AdditionalLibraryDirectories=""/> <Tool Name="VCMIDLTool"/> diff --git a/make/msvc_7_0/blender/avi/BL_avi.vcproj b/make/msvc_7_0/blender/avi/BL_avi.vcproj index 85bfdf4b5ec..9e080c3c114 100644 --- a/make/msvc_7_0/blender/avi/BL_avi.vcproj +++ b/make/msvc_7_0/blender/avi/BL_avi.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\include,$(SolutionDir)lib\windows\jpeg\include,$(SolutionDir)source\blender\makesdna" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\include,$(SolutionDir)..\lib\windows\jpeg\include,$(SolutionDir)source\blender\makesdna" PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -66,7 +66,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc;$(SolutionDir)source\blender\blenlib;$(SolutionDir)source\blender\avi;$(SolutionDir)source\blender\include;$(SolutionDir)lib\windows\jpeg\include;$(SolutionDir)source\blender\makesdna" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc;$(SolutionDir)source\blender\blenlib;$(SolutionDir)source\blender\avi;$(SolutionDir)source\blender\include;$(SolutionDir)..\lib\windows\jpeg\include;$(SolutionDir)source\blender\makesdna" PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -84,7 +84,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blender\avi\debug\BL_avi.lib" + OutputFile="$(SolutionDir)..\lib\windows\blender\avi\debug\BL_avi.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\include,$(SolutionDir)lib\windows\jpeg\include,$(SolutionDir)source\blender\makesdna" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\include,$(SolutionDir)..\lib\windows\jpeg\include,$(SolutionDir)source\blender\makesdna" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN" StringPooling="TRUE" RuntimeLibrary="0" @@ -130,7 +130,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blender\avi\BL_avi.lib" + OutputFile="$(SolutionDir)..\lib\windows\blender\avi\BL_avi.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -158,7 +158,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\include,$(SolutionDir)lib\windows\jpeg\include,$(SolutionDir)source\blender\makesdna" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\include,$(SolutionDir)..\lib\windows\jpeg\include,$(SolutionDir)source\blender\makesdna" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN" StringPooling="TRUE" RuntimeLibrary="2" diff --git a/make/msvc_7_0/blender/blender.vcproj b/make/msvc_7_0/blender/blender.vcproj index dce90c18287..df3bc4c0588 100644 --- a/make/msvc_7_0/blender/blender.vcproj +++ b/make/msvc_7_0/blender/blender.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(SolutionDir)source\blender\misc";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender\bpython\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\renderconverter\";"$(SolutionDir)source\blender\renderui\";"$(SolutionDir)lib\windows\quicktime\include";"$(SolutionDir)lib\windows\ftgl\include"" + AdditionalIncludeDirectories=""$(SolutionDir)source\blender\misc";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\renderconverter\";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\renderui\";"$(SolutionDir)..\lib\windows\quicktime\include";"$(SolutionDir)..\lib\windows\ftgl\include"" PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;WITH_QUICKTIME;INTERNATIONAL" StringPooling="TRUE" RuntimeLibrary="0" @@ -39,11 +39,11 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="odelib.lib openal_static.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib vfw32.lib blenderqt.lib libdecimation.lib libblenkey.lib libeay32.lib libiksolver.lib libpng.a libz.a libmoto.lib BPY_python.lib BPY_frozen.lib freetype2ST.lib ftgl_static_ST.lib FTF_ttfont.lib gnu_gettext.lib qtmlClient.lib" + AdditionalDependencies="odelib.lib openal_static.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a ws2_32.lib winmm.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib vfw32.lib blenderqt.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a BPY_python.lib freetype2ST.lib ftgl_static_ST.lib FTF_ttfont.lib gnu_gettext.lib qtmlClient.lib SDL.lib libSoundSystem.a libOpenALSoundSystem.lib libDummySoundSystem.lib" OutputFile="$(SolutionDir)obj\windows\blender.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=""$(SolutionDir)lib\windows\ode\lib";"$(SolutionDir)lib\windows\bsp\lib";"$(SolutionDir)lib\windows\moto\lib";"$(SolutionDir)lib\windows\bmfont\lib";"$(SolutionDir)lib\windows\ghost\lib";"$(SolutionDir)lib\windows\python\frozen";"$(SolutionDir)lib\windows\guardedalloc\lib";"$(SolutionDir)lib\windows\string\lib";"$(SolutionDir)lib\windows\python\lib";"$(SolutionDir)lib\windows\iksolver\lib";"$(SolutionDir)lib\windows\decimation\lib";"$(SolutionDir)lib\windows\openal\lib";"$(SolutionDir)lib\windows\jpeg\lib";"$(SolutionDir)lib\windows\blenkey\lib";"$(SolutionDir)lib\windows\openssl\lib";"$(SolutionDir)lib\windows\zlib\lib\";"$(SolutionDir)lib\windows\png\lib\";"$(SolutionDir)lib\windows\bpython";"$(SolutionDir)lib\windows\freetype\lib";"$(SolutionDir)lib\windows\quicktime\lib";"$(SolutionDir)lib\windows\ftfont\lib";"$(SolutionDir)lib\windows\ftgl\lib";"$(SolutionDir)lib\windows\gettext\lib";"$(SolutionDir)lib\windows\blenderqt\lib"" + AdditionalLibraryDirectories=""$(SolutionDir)..\lib\windows\SoundSystem\lib";"$(SolutionDir)..\lib\windows\sdl\lib";"$(SolutionDir)..\lib\windows\ode\lib";"$(SolutionDir)..\lib\windows\bsp\lib";"$(SolutionDir)..\lib\windows\moto\lib";"$(SolutionDir)..\lib\windows\bmfont\lib";"$(SolutionDir)..\lib\windows\ghost\lib";"$(SolutionDir)..\lib\windows\python\frozen";"$(SolutionDir)..\lib\windows\guardedalloc\lib";"$(SolutionDir)..\lib\windows\string\lib";"$(SolutionDir)..\lib\windows\python\lib";"$(SolutionDir)..\lib\windows\iksolver\lib";"$(SolutionDir)..\lib\windows\decimation\lib";"$(SolutionDir)..\lib\windows\openal\lib";"$(SolutionDir)..\lib\windows\jpeg\lib";"$(SolutionDir)..\lib\windows\blenkey\lib";"$(SolutionDir)..\lib\windows\openssl\lib";"$(SolutionDir)..\lib\windows\zlib\lib\";"$(SolutionDir)..\lib\windows\png\lib\";"$(SolutionDir)..\lib\windows\bpython";"$(SolutionDir)..\lib\windows\freetype\lib";"$(SolutionDir)..\lib\windows\quicktime\lib";"$(SolutionDir)..\lib\windows\ftfont\lib";"$(SolutionDir)..\lib\windows\ftgl\lib";"$(SolutionDir)..\lib\windows\gettext\lib";"$(SolutionDir)..\lib\windows\blenderqt\lib"" IgnoreDefaultLibraryNames="msvcprt.lib,glut32.lib,libcd.lib,libc.lib,libcpd.lib,libcp.lib,libcmtd.lib" ProgramDatabaseFile="$(SolutionDir)obj\windows\blender/blender.pdb" SubSystem="1"/> @@ -76,7 +76,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)source\blender\misc";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender\bpython\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\renderconverter\";"$(SolutionDir)source\blender\renderui\";"$(SolutionDir)lib\windows\quicktime\include";"$(SolutionDir)lib\windows\ftgl\include"" + AdditionalIncludeDirectories=""$(SolutionDir)source\blender\misc";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\renderconverter\";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\renderui\";"$(SolutionDir)..\lib\windows\quicktime\include";"$(SolutionDir)..\lib\windows\ftgl\include"" PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;WITH_QUICKTIME;INTERNATIONAL" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -94,11 +94,11 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="odelib.lib openal_static.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib vfw32.lib blenderqt.lib libdecimation.lib libblenkey.lib libeay32.lib libiksolver.lib libpng.a libz.a libmoto.lib BPY_python.lib BPY_frozen.lib freetype2ST.lib ftgl_static_ST.lib FTF_ttfont.lib gnu_gettext.lib qtmlClient.lib" + AdditionalDependencies="odelib.lib openal_static.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a ws2_32.lib winmm.lib dxguid.lib opengl32.lib libjpeg.a glu32.lib vfw32.lib blenderqt.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a BPY_python.lib freetype2ST.lib ftgl_static_ST.lib FTF_ttfont.lib gnu_gettext.lib qtmlClient.lib SDL.lib libSoundSystem.a libOpenALSoundSystem.lib libDummySoundSystem.lib" OutputFile="$(SolutionDir)obj\windows\debug\blender.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=""$(SolutionDir)lib\windows\ode\lib";"$(SolutionDir)lib\windows\bsp\lib\debug";"$(SolutionDir)lib\windows\moto\lib\debug";"$(SolutionDir)lib\windows\bmfont\lib\debug";"$(SolutionDir)lib\windows\ghost\lib\debug";"$(SolutionDir)lib\windows\bpython\frozen\lib\debug";"$(SolutionDir)lib\windows\guardedalloc\lib";"$(SolutionDir)lib\windows\string\lib";"$(SolutionDir)lib\windows\python\lib";"$(SolutionDir)lib\windows\iksolver\lib";"$(SolutionDir)lib\windows\decimation\lib";"$(SolutionDir)lib\windows\openal\lib";"$(SolutionDir)lib\windows\jpeg\lib";"$(SolutionDir)lib\windows\blenkey\lib";"$(SolutionDir)lib\windows\openssl\lib";"$(SolutionDir)lib\windows\zlib\lib\";"$(SolutionDir)lib\windows\png\lib\";"$(SolutionDir)lib\windows\bpython\debug";"$(SolutionDir)lib\windows\freetype\lib";"$(SolutionDir)lib\windows\quicktime\lib";"$(SolutionDir)lib\windows\ftfont\lib\debug";"$(SolutionDir)lib\windows\ftgl\lib";"$(SolutionDir)lib\windows\gettext\lib";"$(SolutionDir)lib\windows\blenderqt\lib\debug"" + AdditionalLibraryDirectories=""$(SolutionDir)..\lib\windows\SoundSystem\lib\debug";"$(SolutionDir)..\lib\windows\ode\lib";"$(SolutionDir)..\lib\windows\bsp\lib\debug";"$(SolutionDir)..\lib\windows\moto\lib\debug";"$(SolutionDir)..\lib\windows\bmfont\lib\debug";"$(SolutionDir)..\lib\windows\ghost\lib\debug";"$(SolutionDir)..\lib\windows\bpython\frozen\lib\debug";"$(SolutionDir)..\lib\windows\guardedalloc\lib";"$(SolutionDir)..\lib\windows\string\lib";"$(SolutionDir)..\lib\windows\python\lib";"$(SolutionDir)..\lib\windows\iksolver\lib";"$(SolutionDir)..\lib\windows\decimation\lib";"$(SolutionDir)..\lib\windows\openal\lib";"$(SolutionDir)..\lib\windows\jpeg\lib";"$(SolutionDir)..\lib\windows\blenkey\lib";"$(SolutionDir)..\lib\windows\openssl\lib";"$(SolutionDir)..\lib\windows\zlib\lib\";"$(SolutionDir)..\lib\windows\png\lib\";"$(SolutionDir)..\lib\windows\bpython\debug";"$(SolutionDir)..\lib\windows\freetype\lib";"$(SolutionDir)..\lib\windows\quicktime\lib";"$(SolutionDir)..\lib\windows\ftfont\lib\debug";"$(SolutionDir)..\lib\windows\ftgl\lib";"$(SolutionDir)..\lib\windows\gettext\lib";"$(SolutionDir)..\lib\windows\sdl\lib";"$(SolutionDir)..\lib\windows\blenderqt\lib\debug"" IgnoreDefaultLibraryNames="glut32.lib,libcd.lib,libc.lib,libcpd.lib,libcp.lib,libcmt.lib,libcpmt.lib,msvcprtd.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(SolutionDir)obj\windows\blender\debug/blender.pdb" diff --git a/make/msvc_7_0/blender/blenderqt/blenderqt.vcproj b/make/msvc_7_0/blender/blenderqt/blenderqt.vcproj index b7c3fd200c5..f2b1689bce1 100644 --- a/make/msvc_7_0/blender/blenderqt/blenderqt.vcproj +++ b/make/msvc_7_0/blender/blenderqt/blenderqt.vcproj @@ -19,7 +19,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\blender\imbuf\intern";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\quicktime";"$(SolutionDir)lib\windows\quicktime\include"" + AdditionalIncludeDirectories=""$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\blender\imbuf\intern";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\quicktime";"$(SolutionDir)..\lib\windows\quicktime\include"" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WITH_QUICKTIME;_WIN32" MinimalRebuild="TRUE" BasicRuntimeChecks="3" @@ -32,7 +32,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blenderqt\lib\debug\blenderqt.lib"/> + OutputFile="$(SolutionDir)..\lib\windows\blenderqt\lib\debug\blenderqt.lib"/> <Tool Name="VCMIDLTool"/> <Tool @@ -57,7 +57,7 @@ Optimization="2" InlineFunctionExpansion="1" OmitFramePointers="TRUE" - AdditionalIncludeDirectories=""$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\blender\imbuf\intern";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\quicktime";"$(SolutionDir)lib\windows\quicktime\include"" + AdditionalIncludeDirectories=""$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\blender\imbuf\intern";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\quicktime";"$(SolutionDir)..\lib\windows\quicktime\include"" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_WIN32;WITH_QUICKTIME" StringPooling="TRUE" RuntimeLibrary="4" @@ -70,7 +70,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blenderqt\lib\blenderqt.lib"/> + OutputFile="$(SolutionDir)..\lib\windows\blenderqt\lib\blenderqt.lib"/> <Tool Name="VCMIDLTool"/> <Tool diff --git a/make/msvc_7_0/blender/blenkernel/BKE_blenkernel.vcproj b/make/msvc_7_0/blender/blenkernel/BKE_blenkernel.vcproj index 49be5644f67..65650e0d8f1 100644 --- a/make/msvc_7_0/blender/blenkernel/BKE_blenkernel.vcproj +++ b/make/msvc_7_0/blender/blenkernel/BKE_blenkernel.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blenloader,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source/gameengine\SoundSystem\,$(SolutionDir)lib/windows/iksolver/include,$(SolutionDir)lib/windows/bsp/include" + AdditionalIncludeDirectories="$(SolutionDir)source\blenloader,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\python,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source/gameengine\SoundSystem\,$(SolutionDir)..\lib/windows/iksolver/include,$(SolutionDir)..\lib/windows/bsp/include" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -66,7 +66,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib/windows/bsp/include;$(SolutionDir)intern\guardedalloc;$(SolutionDir)source\blender\renderconverter;$(SolutionDir)source\blender\render\extern\include;$(SolutionDir)source\blender\avi;$(SolutionDir)source\blender\imbuf;$(SolutionDir)source\kernel\gen_system;$(SolutionDir)source\blender\blenloader;$(SolutionDir)source\blender;$(SolutionDir)source\blender\include;$(SolutionDir)source\blender\blenkernel;$(SolutionDir)source\blender\makesdna;$(SolutionDir)source\blender\bpython\include;$(SolutionDir)source\blender\blenlib;$(SolutionDir)source/gameengine\SoundSystem\;$(SolutionDir)intern/iksolver/extern" + AdditionalIncludeDirectories="$(SolutionDir)..\lib/windows/bsp/include;$(SolutionDir)intern\guardedalloc;$(SolutionDir)source\blender\renderconverter;$(SolutionDir)source\blender\render\extern\include;$(SolutionDir)source\blender\avi;$(SolutionDir)source\blender\imbuf;$(SolutionDir)source\kernel\gen_system;$(SolutionDir)source\blender\blenloader;$(SolutionDir)source\blender;$(SolutionDir)source\blender\include;$(SolutionDir)source\blender\blenkernel;$(SolutionDir)source\blender\makesdna;$(SolutionDir)source\blender\python;$(SolutionDir)source\blender\blenlib;$(SolutionDir)source/gameengine\SoundSystem\;$(SolutionDir)intern/iksolver/extern" PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_FREETYPE2" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -84,7 +84,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blender\blenkernel\debug\BKE_blenkernel.lib" + OutputFile="$(SolutionDir)..\lib\windows\blender\blenkernel\debug\BKE_blenkernel.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(SolutionDir)inter\bsp\extern";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\renderconverter";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\bpython\include";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source/gameengine\SoundSystem\";"$(SolutionDir)intern\iksolver\extern";"$(SolutionDir)lib\windows\freetype\include"" + AdditionalIncludeDirectories=""$(SolutionDir)inter\bsp\extern";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\renderconverter";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source/gameengine\SoundSystem\";"$(SolutionDir)intern\iksolver\extern";"$(SolutionDir)..\lib\windows\freetype\include"" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2" StringPooling="TRUE" RuntimeLibrary="0" @@ -130,7 +130,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blender\blenkernel\BKE_blenkernel.lib" + OutputFile="$(SolutionDir)..\lib\windows\blender\blenkernel\BKE_blenkernel.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -158,7 +158,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\blenlib,$(SolutionDir)../../../source/gameengine\SoundSystem\,$(SolutionDir)../../../../lib/windows/iksolver/include,$(SolutionDir)../../../../lib/windows/bsp/include" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\python,$(SolutionDir)source\blender\blenlib,$(SolutionDir)../../../source/gameengine\SoundSystem\,$(SolutionDir)../../../../lib/windows/iksolver/include,$(SolutionDir)../../../../lib/windows/bsp/include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -285,6 +285,9 @@ RelativePath="$(SolutionDir)source\blender\blenkernel\intern\screen.c"> </File> <File + RelativePath="..\..\..\..\source\blender\blenkernel\intern\script.c"> + </File> + <File RelativePath="$(SolutionDir)source\blender\blenkernel\intern\sound.c"> </File> <File diff --git a/make/msvc_7_0/blender/blenlib/BLI_blenlib.vcproj b/make/msvc_7_0/blender/blenlib/BLI_blenlib.vcproj index b9a001c184c..dd0e8d95eb5 100644 --- a/make/msvc_7_0/blender/blenlib/BLI_blenlib.vcproj +++ b/make/msvc_7_0/blender/blenlib/BLI_blenlib.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\makesdna" + AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)..\lib\windows\freetype\include";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\blenkernel"" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\bpython\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)lib\windows\freetype\include";"$(SolutionDir)source\blender\include"" + AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)..\lib\windows\freetype\include";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\blenkernel"" PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_FREETYPE2" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -113,7 +113,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\bpython\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)lib\windows\freetype\include";"$(SolutionDir)source\blender\include"" + AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)..\lib\windows\freetype\include";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\blenkernel"" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2" StringPooling="TRUE" RuntimeLibrary="0" @@ -159,7 +159,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\makesdna" + AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)..\lib\windows\freetype\include";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\blenkernel"" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -269,19 +269,19 @@ RelativePath="$(SolutionDir)source\blender\blenlib\BLI_blenlib.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\BLI_callbacks.h"> + RelativePath="$(SolutionDir)source\blender\blenlib\intern\BLI_callbacks.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\intern\BLI_callbacks.h"> + RelativePath="$(SolutionDir)source\blender\blenlib\BLI_callbacks.h"> </File> <File RelativePath="$(SolutionDir)source\blender\blenlib\BLI_editVert.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\BLI_fileops.h"> + RelativePath="$(SolutionDir)source\blender\blenlib\intern\BLI_fileops.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\intern\BLI_fileops.h"> + RelativePath="$(SolutionDir)source\blender\blenlib\BLI_fileops.h"> </File> <File RelativePath="$(SolutionDir)source\blender\blenlib\BLI_ghash.h"> @@ -302,10 +302,10 @@ RelativePath="$(SolutionDir)source\blender\blenlib\BLI_noise.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\BLI_objfnt.h"> + RelativePath="$(SolutionDir)source\blender\blenlib\intern\BLI_objfnt.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\intern\BLI_objfnt.h"> + RelativePath="$(SolutionDir)source\blender\blenlib\BLI_objfnt.h"> </File> <File RelativePath="$(SolutionDir)source\blender\blenlib\BLI_objfnt_types.h"> @@ -323,27 +323,27 @@ RelativePath="$(SolutionDir)source\blender\blenlib\BLI_rct.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\BLI_scanfill.h"> - </File> - <File RelativePath="$(SolutionDir)source\blender\blenlib\intern\BLI_scanfill.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\BLI_storage.h"> + RelativePath="$(SolutionDir)source\blender\blenlib\BLI_scanfill.h"> </File> <File RelativePath="$(SolutionDir)source\blender\blenlib\intern\BLI_storage.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\BLI_storage_types.h"> + RelativePath="$(SolutionDir)source\blender\blenlib\BLI_storage.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\blenlib\BLI_util.h"> + RelativePath="$(SolutionDir)source\blender\blenlib\BLI_storage_types.h"> </File> <File RelativePath="$(SolutionDir)source\blender\blenlib\intern\BLI_util.h"> </File> <File + RelativePath="$(SolutionDir)source\blender\blenlib\BLI_util.h"> + </File> + <File RelativePath="$(SolutionDir)source\blender\blenlib\BLI_vec_types.h"> </File> <File diff --git a/make/msvc_7_0/blender/bpython/frozen/BPY_frozen.vcproj b/make/msvc_7_0/blender/bpython/frozen/BPY_frozen.vcproj index 3a103edcb30..c475451d653 100644 --- a/make/msvc_7_0/blender/bpython/frozen/BPY_frozen.vcproj +++ b/make/msvc_7_0/blender/bpython/frozen/BPY_frozen.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2" PreprocessorDefinitions="WIN32,NDEBUG,_LIB,FUTURE_PYTHON_API" StringPooling="TRUE" RuntimeLibrary="0" @@ -39,7 +39,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\bpython\BPY_frozen.lib" + OutputFile="$(SolutionDir)..\lib\windows\bpython\BPY_frozen.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2" PreprocessorDefinitions="WIN32,_LIB,FUTURE_PYTHON_API" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -85,7 +85,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\bpython\frozen\lib\debug\BPY_frozen.lib" + OutputFile="$(SolutionDir)..\lib\windows\bpython\frozen\lib\debug\BPY_frozen.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> diff --git a/make/msvc_7_0/blender/bpython/intern/BPY_python/BPY_python.vcproj b/make/msvc_7_0/blender/bpython/intern/BPY_python/BPY_python.vcproj index 9fcb6892878..dbbafb5b944 100644 --- a/make/msvc_7_0/blender/bpython/intern/BPY_python/BPY_python.vcproj +++ b/make/msvc_7_0/blender/bpython/intern/BPY_python/BPY_python.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\guardedalloc,$(SolutionDir)intern\bmfont,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\blenlib\intern" + AdditionalIncludeDirectories=""$(SolutionDir)..\lib\windows\python\include\python2.2";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)intern\bmfont";"$(SolutionDir)source\blender\renderconverter";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\blenlib\intern";"$(SolutionDir)source\blender\imbuf"" PreprocessorDefinitions="WIN32,_LIB,FUTURE_PYTHON_API" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -41,7 +41,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\bpython\debug\BPY_python.lib" + OutputFile="$(SolutionDir)..\lib\windows\bpython\debug\BPY_python.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -68,7 +68,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\bmfont,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\blenlib\intern" + AdditionalIncludeDirectories=""$(SolutionDir)..\lib\windows\python\include\python2.2";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)intern\bmfont";"$(SolutionDir)source\blender\renderconverter";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\blenlib\intern";"$(SolutionDir)source\blender\imbuf"" PreprocessorDefinitions="WIN32,NDEBUG,_LIB,FUTURE_PYTHON_API" StringPooling="TRUE" RuntimeLibrary="0" @@ -86,7 +86,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\bpython\BPY_python.lib" + OutputFile="$(SolutionDir)..\lib\windows\bpython\BPY_python.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -109,122 +109,233 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_constobject.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Armature.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_image.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\BGL.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_ipo.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\BPY_interface.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_links.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\BezTriple.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_main.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Blender.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_object.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Bone.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_scene.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Build.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_text.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Camera.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_tools.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Curve.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\b_import.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Draw.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\b_interface.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\EXPP_interface.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_blender.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Effect.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_datablock.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Image.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_draw.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Ipo.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_matrix.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Ipocurve.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_nmesh.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Lamp.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_vector.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Lattice.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_window.c"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\MTex.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Material.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Metaball.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\NMesh.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Object.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Particle.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Registry.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Scene.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Sys.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Text.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Texture.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Types.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Wave.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Window.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\World.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\constant.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\gen_utils.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\matrix.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\rgbTuple.c"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\vector.c"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl"> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_constobject.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Armature.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\BGL.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\BPY_extern.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\BezTriple.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Blender.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Bone.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Build.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Camera.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Curve.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Draw.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\EXPP_interface.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Effect.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Image.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Ipo.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Ipocurve.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Lamp.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Lattice.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\MTex.h"> + </File> + <File + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Material.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\include\BPY_extern.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Metaball.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_listbase_macro.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\NMesh.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_macros.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Object.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_main.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Particle.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_modules.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Registry.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\include\BPY_objtypes.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Scene.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_tools.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Sys.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_types.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Text.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\BPY_window.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Texture.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\api.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Types.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\b_import.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Wave.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\b_interface.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\Window.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_datablock.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\World.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_nmesh.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\bpy_types.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\opy_vector.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\constant.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\py_general.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\gen_utils.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\py_gui.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\modules.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\py_object_types.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\rgbTuple.h"> </File> <File - RelativePath="$(SolutionDir)source\blender\bpython\intern\py_objects.h"> + RelativePath="..\..\..\..\..\..\source\blender\python\api2_2x\vector.h"> </File> </Filter> </Files> diff --git a/make/msvc_7_0/blender/glut/BL_glut.vcproj b/make/msvc_7_0/blender/glut/BL_glut.vcproj index f3cce71adbc..62cd75a5ba9 100644 --- a/make/msvc_7_0/blender/glut/BL_glut.vcproj +++ b/make/msvc_7_0/blender/glut/BL_glut.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\glut-3.7\include,$(SolutionDir)source\blender\glut-win,$(SolutionDir)source\blender\" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\glut-3.7\include,$(SolutionDir)source\blender\glut-win,$(SolutionDir)source\blender\" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="5" @@ -69,7 +69,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\glut-3.7\include,$(SolutionDir)source\blender\glut-win,$(SolutionDir)source\blender\" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\glut-3.7\include,$(SolutionDir)source\blender\glut-win,$(SolutionDir)source\blender\" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -116,7 +116,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\,$(SolutionDir)lib\windows\glut-3.7\include,$(SolutionDir)source\blender\glut-win" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\,$(SolutionDir)..\lib\windows\glut-3.7\include,$(SolutionDir)source\blender\glut-win" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="4" diff --git a/make/msvc_7_0/blender/imbuf/BL_imbuf.vcproj b/make/msvc_7_0/blender/imbuf/BL_imbuf.vcproj index 4ba164e190c..05cef7b4aae 100644 --- a/make/msvc_7_0/blender/imbuf/BL_imbuf.vcproj +++ b/make/msvc_7_0/blender/imbuf/BL_imbuf.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\include";"$(SolutionDir)lib\windows\jpeg\include";"$(SolutionDir)lib\windows\zlib\include";"$(SolutionDir)lib\windows\png\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)lib\windows\quicktime\include";"$(SolutionDir)source\blender\quicktime"" + AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\include";"$(SolutionDir)..\lib\windows\jpeg\include";"$(SolutionDir)..\lib\windows\zlib\include";"$(SolutionDir)..\lib\windows\png\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)..\lib\windows\quicktime\include";"$(SolutionDir)source\blender\quicktime"" PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\include,$(SolutionDir)lib\windows\jpeg\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)lib\windows\png\include,$(SolutionDir)source\blender\makesdna" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\include,$(SolutionDir)..\lib\windows\jpeg\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)..\lib\windows\png\include,$(SolutionDir)source\blender\makesdna" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -111,7 +111,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\include,$(SolutionDir)lib\windows\jpeg\include,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)lib\windows\png\include,$(SolutionDir)source\blender\makesdna" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\avi,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\include,$(SolutionDir)..\lib\windows\jpeg\include,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)..\lib\windows\png\include,$(SolutionDir)source\blender\makesdna" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -156,7 +156,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\include";"$(SolutionDir)lib\windows\jpeg\include";"$(SolutionDir)lib\windows\zlib\include";"$(SolutionDir)lib\windows\png\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)lib\windows\quicktime\include";"$(SolutionDir)source\blender\quicktime"" + AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\avi";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\include";"$(SolutionDir)..\lib\windows\jpeg\include";"$(SolutionDir)..\lib\windows\zlib\include";"$(SolutionDir)..\lib\windows\png\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)..\lib\windows\quicktime\include";"$(SolutionDir)source\blender\quicktime"" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME" StringPooling="TRUE" RuntimeLibrary="0" @@ -197,6 +197,9 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File + RelativePath="..\..\..\..\source\blender\imbuf\intern\IMB_anim.h"> + </File> + <File RelativePath="$(SolutionDir)source\blender\imbuf\intern\allocimbuf.c"> </File> <File @@ -254,10 +257,7 @@ RelativePath="$(SolutionDir)source\blender\imbuf\intern\jpeg.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\imbuf\intern\png_decode.c"> - </File> - <File - RelativePath="$(SolutionDir)source\blender\imbuf\intern\png_encode.c"> + RelativePath="..\..\..\..\source\blender\imbuf\intern\png.c"> </File> <File RelativePath="$(SolutionDir)source\blender\imbuf\intern\readimage.c"> diff --git a/make/msvc_7_0/blender/img/BL_img.vcproj b/make/msvc_7_0/blender/img/BL_img.vcproj index 9634edfb911..4653d4941fa 100644 --- a/make/msvc_7_0/blender/img/BL_img.vcproj +++ b/make/msvc_7_0/blender/img/BL_img.vcproj @@ -82,7 +82,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blender\img\debug\BL_img.lib" + OutputFile="$(SolutionDir)..\lib\windows\blender\img\debug\BL_img.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> diff --git a/make/msvc_7_0/blender/loader/BLO_loader.vcproj b/make/msvc_7_0/blender/loader/BLO_loader.vcproj index cd8b6e592bb..c3d0b94d253 100644 --- a/make/msvc_7_0/blender/loader/BLO_loader.vcproj +++ b/make/msvc_7_0/blender/loader/BLO_loader.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\include;$(SolutionDir)source\blender\blenloader;$(SolutionDir)source\blender\streamglue\;$(SolutionDir)source\blender\readblenfile\;$(SolutionDir)source\blender\writeblenfile\;$(SolutionDir)source\blender\deflate\;$(SolutionDir)source\blender\inflate\;$(SolutionDir)lib\windows\zlib\include;$(SolutionDir)source\blender\readblenfile;$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\readstreamglue;$(SolutionDir)source\blender\writestreamglue;$(SolutionDir)source\blender\blenkernel;$(SolutionDir)source\blender\makesdna;$(SolutionDir)source\blender\render\extern\include;$(SolutionDir)source\blender\blenlib;$(SolutionDir)source\blender\bpython\include" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\include;$(SolutionDir)source\blender\blenloader;$(SolutionDir)source\blender\streamglue\;$(SolutionDir)source\blender\readblenfile\;$(SolutionDir)source\blender\writeblenfile\;$(SolutionDir)source\blender\deflate\;$(SolutionDir)source\blender\inflate\;$(SolutionDir)..\lib\windows\zlib\include;$(SolutionDir)source\blender\readblenfile;$(SolutionDir)source\kernel\gen_messaging;$(SolutionDir)source\blender\readstreamglue;$(SolutionDir)source\blender\writestreamglue;$(SolutionDir)source\blender\blenkernel;$(SolutionDir)source\blender\makesdna;$(SolutionDir)source\blender\render\extern\include;$(SolutionDir)source\blender\blenlib;$(SolutionDir)source\blender\python" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -68,7 +68,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\bpython\include" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\python" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -113,7 +113,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\bpython\include" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\python" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -158,7 +158,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\blenloader,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)lib\windows\zlib\include,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\bpython\include" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\blenloader,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\streamglue\,$(SolutionDir)source\blender\readblenfile\,$(SolutionDir)source\blender\writeblenfile\,$(SolutionDir)source\blender\deflate\,$(SolutionDir)source\blender\inflate\,$(SolutionDir)..\lib\windows\zlib\include,$(SolutionDir)source\blender\readblenfile,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\blender\writestreamglue,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\python" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/blender/makesdna/DNA_makesdna.vcproj b/make/msvc_7_0/blender/makesdna/DNA_makesdna.vcproj index b1d6e4a0e86..04ea8cbac85 100644 --- a/make/msvc_7_0/blender/makesdna/DNA_makesdna.vcproj +++ b/make/msvc_7_0/blender/makesdna/DNA_makesdna.vcproj @@ -44,7 +44,7 @@ OutputFile="$(SolutionDir)source\blender\makesdna\intern/DNA_makesdna.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\guardedalloc\lib" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\guardedalloc\lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="DNA_makesdna.pdb" SubSystem="1"/> @@ -164,7 +164,7 @@ DNA_makesdna.exe dna.c OutputFile="$(SolutionDir)source\blender\makesdna\intern/DNA_makesdna.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\guardedalloc\lib,$(SolutionDir)obj\windows\blender\blenlib" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\guardedalloc\lib,$(SolutionDir)obj\windows\blender\blenlib" ProgramDatabaseFile="DNA_makesdna.pdb" SubSystem="1"/> <Tool @@ -222,7 +222,7 @@ DNA_makesdna.exe dna.c OutputFile="$(SolutionDir)source\blender\makesdna\intern/DNA_makesdna.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\guardedalloc\lib,$(SolutionDir)obj\windows\blender\blenlib\debug" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\guardedalloc\lib,$(SolutionDir)obj\windows\blender\blenlib\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="DNA_makesdna.pdb" diff --git a/make/msvc_7_0/blender/radiosity/BRA_radiosity.vcproj b/make/msvc_7_0/blender/radiosity/BRA_radiosity.vcproj index 99e43f84498..8e8c13d369e 100644 --- a/make/msvc_7_0/blender/radiosity/BRA_radiosity.vcproj +++ b/make/msvc_7_0/blender/radiosity/BRA_radiosity.vcproj @@ -126,6 +126,9 @@ <File RelativePath="$(SolutionDir)source\blender\radiosity\intern\source\radpreprocess.c"> </File> + <File + RelativePath="..\..\..\..\source\blender\radiosity\intern\source\radrender.c"> + </File> </Filter> <Filter Name="Header Files" diff --git a/make/msvc_7_0/blender/render/BRE_render.vcproj b/make/msvc_7_0/blender/render/BRE_render.vcproj index d8de7599c7b..46cdad5ff4a 100644 --- a/make/msvc_7_0/blender/render/BRE_render.vcproj +++ b/make/msvc_7_0/blender/render/BRE_render.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\kernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\blender\render\intern\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\bpython\include";"$(SolutionDir)source\blender";"$(SolutionDir)lib\windows\quicktime\include";"$(SolutionDir)source\blender\quicktime"" + AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\kernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\blender\render\intern\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender";"$(SolutionDir)..\lib\windows\quicktime\include";"$(SolutionDir)source\blender\quicktime"" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME" StringPooling="TRUE" RuntimeLibrary="0" @@ -69,7 +69,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\kernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\blender\render\intern\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\bpython\include";"$(SolutionDir)source\blender";"$(SolutionDir)lib\windows\quicktime\include";"$(SolutionDir)source\blender\quicktime"" + AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\kernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\blender\render\intern\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender";"$(SolutionDir)..\lib\windows\quicktime\include";"$(SolutionDir)source\blender\quicktime"" PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -110,12 +110,6 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="$(SolutionDir)source\blender\render\intern\source\RE_DummyShadowBuffer.cpp"> - </File> - <File - RelativePath="$(SolutionDir)source\blender\render\intern\source\RE_basicShadowBuffer.cpp"> - </File> - <File RelativePath="$(SolutionDir)source\blender\render\intern\source\RE_callbacks.c"> </File> <File @@ -146,6 +140,9 @@ RelativePath="$(SolutionDir)source\blender\render\intern\source\pixelshading.c"> </File> <File + RelativePath="..\..\..\..\source\blender\render\intern\source\ray.c"> + </File> + <File RelativePath="$(SolutionDir)source\blender\render\intern\source\renderHelp.c"> </File> <File @@ -161,7 +158,7 @@ RelativePath="$(SolutionDir)source\blender\render\intern\source\shadbuf.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\render\intern\source\shadowBuffer.cpp"> + RelativePath="..\..\..\..\source\blender\render\intern\source\texture.c"> </File> <File RelativePath="$(SolutionDir)source\blender\render\intern\source\vanillaRenderPipe.c"> diff --git a/make/msvc_7_0/blender/renderconverter/BRE_renderconverter.vcproj b/make/msvc_7_0/blender/renderconverter/BRE_renderconverter.vcproj index e54151a8e4f..239ccc0f9b4 100644 --- a/make/msvc_7_0/blender/renderconverter/BRE_renderconverter.vcproj +++ b/make/msvc_7_0/blender/renderconverter/BRE_renderconverter.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\render\extern\include" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\python,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\render\extern\include" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -68,7 +68,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\render\extern\include" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\python,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\render\extern\include" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/make/msvc_7_0/blender/src/BL_src.vcproj b/make/msvc_7_0/blender/src/BL_src.vcproj index 20fa6661687..36041065a33 100644 --- a/make/msvc_7_0/blender/src/BL_src.vcproj +++ b/make/msvc_7_0/blender/src/BL_src.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(SolutionDir)source\blender\img";"$(SolutionDir)source\blender\renderui";"$(SolutionDir)source\gameengine\soundsystem\";"$(SolutionDir)lib\windows\python\include\python2.0\";"$(SolutionDir)intern\bmfont";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\renderconverter";"$(SolutionDir)source\blender\verify";"$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\blender\bpython\include";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)intern\decimation\extern";"$(SolutionDir)source\blender\blenpluginapi\";"$(SolutionDir)intern\keymaker";"$(SolutionDir)intern\ghost";"$(SolutionDir)intern\bsp\extern";"$(SolutionDir)source\blender\quicktime";"$(SolutionDir)lib\windows\quicktime\include";"$(SolutionDir)lib\windows\gettext\include";"$(SolutionDir)lib\windows\freetype\include";"$(SolutionDir)lib\windows\ftgl\include";"$(SolutionDir)source\blender\ftfont"" + AdditionalIncludeDirectories=""$(SolutionDir)source\blender\img";"$(SolutionDir)source\blender\renderui";"$(SolutionDir)..\lib\windows\soundsystem\include";"$(SolutionDir)..\lib\windows\python\include\python2.0\";"$(SolutionDir)intern\bmfont";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\renderconverter";"$(SolutionDir)source\blender\verify";"$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)intern\decimation\extern";"$(SolutionDir)source\blender\blenpluginapi\";"$(SolutionDir)intern\keymaker";"$(SolutionDir)intern\ghost";"$(SolutionDir)intern\bsp\extern";"$(SolutionDir)source\blender\quicktime";"$(SolutionDir)..\lib\windows\sdl\include";"$(SolutionDir)..\lib\windows\quicktime\include";"$(SolutionDir)..\lib\windows\gettext\include";"$(SolutionDir)..\lib\windows\freetype\include";"$(SolutionDir)..\lib\windows\ftgl\include";"$(SolutionDir)source\blender\ftfont"" PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;WITH_QUICKTIME;INTERNATIONAL" StringPooling="TRUE" RuntimeLibrary="0" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)source\blender\img";"$(SolutionDir)source\blender\renderui";"$(SolutionDir)source\gameengine\soundsystem\";"$(SolutionDir)lib\windows\python\include\python2.0\";"$(SolutionDir)intern\bmfont";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\renderconverter";"$(SolutionDir)source\blender\verify";"$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\blender\bpython\include";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)intern\decimation\extern";"$(SolutionDir)source\blender\blenpluginapi\";"$(SolutionDir)intern\keymaker";"$(SolutionDir)intern\ghost";"$(SolutionDir)intern\bsp\extern";"$(SolutionDir)source\blender\quicktime";"$(SolutionDir)lib\windows\quicktime\include";"$(SolutionDir)lib\windows\gettext\include";"$(SolutionDir)lib\windows\freetype\include";"$(SolutionDir)lib\windows\ftgl\include";"$(SolutionDir)source\blender\ftfont"" + AdditionalIncludeDirectories=""$(SolutionDir)source\blender\img";"$(SolutionDir)source\blender\renderui";"$(SolutionDir)..\lib\windows\soundsystem\include";"$(SolutionDir)..\lib\windows\python\include\python2.0\";"$(SolutionDir)intern\bmfont";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\renderconverter";"$(SolutionDir)source\blender\verify";"$(SolutionDir)source\blender\readstreamglue";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\blender\blenloader";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\blender\python";"$(SolutionDir)source\blender\radiosity\extern\include";"$(SolutionDir)source\blender\render\extern\include";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)intern\decimation\extern";"$(SolutionDir)source\blender\blenpluginapi\";"$(SolutionDir)intern\keymaker";"$(SolutionDir)intern\ghost";"$(SolutionDir)intern\bsp\extern";"$(SolutionDir)source\blender\quicktime";"$(SolutionDir)..\lib\windows\sdl\include";"$(SolutionDir)..\lib\windows\quicktime\include";"$(SolutionDir)..\lib\windows\gettext\include";"$(SolutionDir)..\lib\windows\freetype\include";"$(SolutionDir)..\lib\windows\ftgl\include";"$(SolutionDir)source\blender\ftfont"" PreprocessorDefinitions="WIN32,_LIB,_CONSOLE,WITH_QUICKTIME,INTERNATIONAL" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -85,7 +85,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blender\src\debug\BL_src.lib" + OutputFile="$(SolutionDir)..\lib\windows\blender\src\debug\BL_src.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -123,7 +123,25 @@ RelativePath="$(SolutionDir)source\blender\src\booleanops_mesh.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\src\buttons.c"> + RelativePath="..\..\..\..\source\blender\src\butspace.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\buttons_editing.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\buttons_logic.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\buttons_object.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\buttons_scene.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\buttons_script.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\buttons_shading.c"> </File> <File RelativePath="$(SolutionDir)source\blender\src\cmap.tga.c"> @@ -132,7 +150,22 @@ RelativePath="$(SolutionDir)source\blender\src\cmovie.tga.c"> </File> <File - RelativePath="..\..\..\..\source\blender\makesdna\dna.c"> + RelativePath="..\..\..\..\source\blender\src\cursors.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\makesdna\intern\dna.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj"/> + </FileConfiguration> </File> <File RelativePath="$(SolutionDir)source\blender\src\drawaction.c"> @@ -162,6 +195,9 @@ RelativePath="$(SolutionDir)source\blender\src\drawscene.c"> </File> <File + RelativePath="..\..\..\..\source\blender\src\drawscript.c"> + </File> + <File RelativePath="$(SolutionDir)source\blender\src\drawseq.c"> </File> <File @@ -231,9 +267,6 @@ RelativePath="$(SolutionDir)source\blender\src\editoops.c"> </File> <File - RelativePath="$(SolutionDir)source\blender\src\editsca.c"> - </File> - <File RelativePath="$(SolutionDir)source\blender\src\editscreen.c"> </File> <File @@ -261,6 +294,48 @@ RelativePath="$(SolutionDir)source\blender\src\glutil.c"> </File> <File + RelativePath="..\..\..\..\source\blender\src\header_action.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_buttonswin.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_filesel.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_image.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_imasel.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_info.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_ipo.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_nla.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_oops.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_script.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_seq.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_sound.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_text.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\header_view3d.c"> + </File> + <File RelativePath="$(SolutionDir)source\blender\src\headerbuttons.c"> </File> <File @@ -270,6 +345,12 @@ RelativePath="$(SolutionDir)source\blender\src\interface.c"> </File> <File + RelativePath="..\..\..\..\source\blender\src\interface_draw.c"> + </File> + <File + RelativePath="..\..\..\..\source\blender\src\interface_panel.c"> + </File> + <File RelativePath="$(SolutionDir)source\blender\src\keyval.c"> </File> <File @@ -309,6 +390,9 @@ RelativePath="$(SolutionDir)source\blender\src\screendump.c"> </File> <File + RelativePath="..\..\..\..\source\blender\src\seqaudio.c"> + </File> + <File RelativePath="$(SolutionDir)source\blender\src\sequence.c"> </File> <File diff --git a/make/msvc_7_0/blender/src/BL_src_cre.vcproj b/make/msvc_7_0/blender/src/BL_src_cre.vcproj index d883301716b..95e341f50a9 100644 --- a/make/msvc_7_0/blender/src/BL_src_cre.vcproj +++ b/make/msvc_7_0/blender/src/BL_src_cre.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderui,$(SolutionDir)source\gameengine\soundsystem\,$(SolutionDir)lib\windows\python\include\python2.2\,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\radiosity\extern\include,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)lib\windows\decimation\include,$(SolutionDir)source\blender\blenpluginapi\,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderui,$(SolutionDir)source\gameengine\soundsystem\,$(SolutionDir)..\lib\windows\python\include\python2.2\,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\python,$(SolutionDir)source\blender\radiosity\extern\include,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)..\lib\windows\decimation\include,$(SolutionDir)source\blender\blenpluginapi\,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,_LIB,_CONSOLE,NAN_GAME,GAME" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blender\src\debug\BL_src_cre.lib" + OutputFile="$(SolutionDir)..\lib\windows\blender\src\debug\BL_src_cre.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -68,7 +68,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderui,$(SolutionDir)source\gameengine\soundsystem\,$(SolutionDir)lib\windows\python\include\python2.2\,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\radiosity\extern\include,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)lib\windows\decimation\include,$(SolutionDir)source\blender\blenpluginapi\,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderui,$(SolutionDir)source\gameengine\soundsystem\,$(SolutionDir)..\lib\windows\python\include\python2.2\,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\python,$(SolutionDir)source\blender\radiosity\extern\include,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)..\lib\windows\decimation\include,$(SolutionDir)source\blender\blenpluginapi\,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_CONSOLE,NAN_GAME,GAME" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/blender/src/BL_src_pub.vcproj b/make/msvc_7_0/blender/src/BL_src_pub.vcproj index 096877329ac..2c1ab0ae9e7 100644 --- a/make/msvc_7_0/blender/src/BL_src_pub.vcproj +++ b/make/msvc_7_0/blender/src/BL_src_pub.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderui,$(SolutionDir)source\gameengine\soundsystem\,$(SolutionDir)lib\windows\python\include\python2.2\,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\radiosity\extern\include,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)lib\windows\decimation\include,$(SolutionDir)source\blender\blenpluginapi\,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderui,$(SolutionDir)source\gameengine\soundsystem\,$(SolutionDir)..\lib\windows\python\include\python2.2\,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\python,$(SolutionDir)source\blender\radiosity\extern\include,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)..\lib\windows\decimation\include,$(SolutionDir)source\blender\blenpluginapi\,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="WIN32,_LIB,_CONSOLE,NAN_GAME,GAME" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(SolutionDir)lib\windows\blender\src\debug\BL_src_pub.lib" + OutputFile="$(SolutionDir)..\lib\windows\blender\src\debug\BL_src_pub.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -68,7 +68,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderui,$(SolutionDir)source\gameengine\soundsystem\,$(SolutionDir)lib\windows\python\include\python2.2\,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\bpython\include,$(SolutionDir)source\blender\radiosity\extern\include,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)lib\windows\decimation\include,$(SolutionDir)source\blender\blenpluginapi\,$(SolutionDir)intern\keymaker" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\renderui,$(SolutionDir)source\gameengine\soundsystem\,$(SolutionDir)..\lib\windows\python\include\python2.2\,$(SolutionDir)source\blender\renderconverter,$(SolutionDir)source\blender\verify,$(SolutionDir)source\blender\readstreamglue,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\blender\blenloader,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\python,$(SolutionDir)source\blender\radiosity\extern\include,$(SolutionDir)source\blender\render\extern\include,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)..\lib\windows\decimation\include,$(SolutionDir)source\blender\blenpluginapi\,$(SolutionDir)intern\keymaker" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_CONSOLE,NAN_GAME,GAME" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/gameengine/blenderhook/KX_blenderhook.vcproj b/make/msvc_7_0/gameengine/blenderhook/KX_blenderhook.vcproj index f1833804ebb..71cf117ef9c 100644 --- a/make/msvc_7_0/gameengine/blenderhook/KX_blenderhook.vcproj +++ b/make/msvc_7_0/gameengine/blenderhook/KX_blenderhook.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)lib\windows\python\include\python2.2";"$(SolutionDir)intern\string";"$(SolutionDir)intern\bmfont";"$(SolutionDir)source\gameengine\Converter\";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)intern\moto\include";"$(SolutionDir)source\gameengine\ketsji";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\scenegraph";"$(SolutionDir)source\sumo\include";"$(SolutionDir)source\sumo\fuzzics\include";"$(SolutionDir)source\gameengine\network\loopbacknetwork";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\blender\blenloader"" + AdditionalIncludeDirectories=""$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)..\lib\windows\python\include\python2.2";"$(SolutionDir)intern\string";"$(SolutionDir)intern\bmfont";"$(SolutionDir)source\gameengine\Converter\";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)intern\moto\include";"$(SolutionDir)source\gameengine\ketsji";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\scenegraph";"$(SolutionDir)source\sumo\include";"$(SolutionDir)source\sumo\fuzzics\include";"$(SolutionDir)source\gameengine\network\loopbacknetwork";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\blender\misc";"$(SolutionDir)source\blender\blenloader"" PreprocessorDefinitions="WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -69,7 +69,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\bmfont,$(SolutionDir)source\gameengine\Converter\,$(SolutionDir)source\blender\imbuf,$(SolutionDir)intern\moto\include,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\blenloader" + AdditionalIncludeDirectories="$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\bmfont,$(SolutionDir)source\gameengine\Converter\,$(SolutionDir)source\blender\imbuf,$(SolutionDir)intern\moto\include,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\blender\misc,$(SolutionDir)source\blender\blenloader" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/gameengine/converter/KX_converter.vcproj b/make/msvc_7_0/gameengine/converter/KX_converter.vcproj index 113a168bf06..5726f23d41c 100644 --- a/make/msvc_7_0/gameengine/converter/KX_converter.vcproj +++ b/make/msvc_7_0/gameengine/converter/KX_converter.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\ode,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\BlenderRoutines,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\BlOde" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\ode,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\BlenderRoutines,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\BlOde" PreprocessorDefinitions="WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\BlOde,$(SolutionDir)source\gameengine\physics\Dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\BlenderRoutines,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\ode,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\BlOde,$(SolutionDir)source\gameengine\physics\Dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\BlenderRoutines,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\ode,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -113,7 +113,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)lib\windows\python\include\python2.2";"$(SolutionDir)source\gameengine\physics";"$(SolutionDir)source\gameengine\physics\ode";"$(SolutionDir)source\gameengine\physics\dummy";"$(SolutionDir)source\gameengine\physics\common";"$(SolutionDir)source\gameengine\physics\BlOde";"$(SolutionDir)intern\string";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\BlenderRoutines";"$(SolutionDir)source\sumo\include";"$(SolutionDir)intern\moto\include";"$(SolutionDir)source\sumo\Fuzzics\include";"$(SolutionDir)source\gameengine\Ketsji";"$(SolutionDir)source\gameengine\SceneGraph";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\ketsji\kxnetwork";"$(SolutionDir)source\gameengine\physics\sumo";"$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include"" + AdditionalIncludeDirectories=""$(SolutionDir)..\lib\windows\python\include\python2.2";"$(SolutionDir)source\gameengine\physics";"$(SolutionDir)source\gameengine\physics\ode";"$(SolutionDir)source\gameengine\physics\dummy";"$(SolutionDir)source\gameengine\physics\common";"$(SolutionDir)source\gameengine\physics\BlOde";"$(SolutionDir)intern\string";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\blender\imbuf";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\BlenderRoutines";"$(SolutionDir)source\sumo\include";"$(SolutionDir)intern\moto\include";"$(SolutionDir)source\sumo\Fuzzics\include";"$(SolutionDir)source\gameengine\Ketsji";"$(SolutionDir)source\gameengine\SceneGraph";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache";"$(SolutionDir)source\blender\blenlib";"$(SolutionDir)source\blender\blenkernel";"$(SolutionDir)source\blender\include";"$(SolutionDir)source\blender";"$(SolutionDir)source\blender\makesdna";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\ketsji\kxnetwork";"$(SolutionDir)source\gameengine\physics\sumo";"$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include"" PreprocessorDefinitions="WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -160,7 +160,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\ode,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\BlenderRoutines,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\BlOde" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\ode,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\blender\imbuf,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\BlenderRoutines,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\soundsystem\snd_blenderwavecache,$(SolutionDir)source\blender\blenlib,$(SolutionDir)source\blender\blenkernel,$(SolutionDir)source\blender\include,$(SolutionDir)source\blender,$(SolutionDir)source\blender\makesdna,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\BlOde" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" diff --git a/make/msvc_7_0/gameengine/expression/EXP_expressions.vcproj b/make/msvc_7_0/gameengine/expression/EXP_expressions.vcproj index 8c5e84cd906..617df86c06f 100644 --- a/make/msvc_7_0/gameengine/expression/EXP_expressions.vcproj +++ b/make/msvc_7_0/gameengine/expression/EXP_expressions.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="WIN32,_LIB,EXP_PYTHON_EMBEDDING" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -69,7 +69,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="WIN32,_LIB,EXP_PYTHON_EMBEDDING" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -115,7 +115,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING" StringPooling="TRUE" RuntimeLibrary="2" @@ -160,7 +160,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="c:\cygwin\home\stl,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="c:\cygwin\home\stl,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING" StringPooling="TRUE" RuntimeLibrary="0" @@ -186,7 +186,7 @@ Name="VCPostBuildEventTool" CommandLine="ECHO Copying lib -XCOPY /Y $(SolutionDir)obj\windows\gameengine\expressions\*.lib $(SolutionDir)lib\windows\gameengine\expressions\lib\*.lib +XCOPY /Y $(SolutionDir)obj\windows\gameengine\expressions\*.lib $(SolutionDir)..\lib\windows\gameengine\expressions\lib\*.lib ECHO Done "/> diff --git a/make/msvc_7_0/gameengine/gamelogic/SCA_GameLogic.vcproj b/make/msvc_7_0/gameengine/gamelogic/SCA_GameLogic.vcproj index cccd5dc93ce..db51cd7f7c1 100644 --- a/make/msvc_7_0/gameengine/gamelogic/SCA_GameLogic.vcproj +++ b/make/msvc_7_0/gameengine/gamelogic/SCA_GameLogic.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)intern\moto\include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)intern\moto\include" PreprocessorDefinitions="WIN32,_LIB,EXP_PYTHON_EMBEDDING" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -68,7 +68,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)intern\moto\include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)intern\moto\include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING" StringPooling="TRUE" RuntimeLibrary="0" @@ -114,7 +114,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)intern\moto\include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)intern\moto\include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING" StringPooling="TRUE" RuntimeLibrary="2" @@ -159,7 +159,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)intern\moto\include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)intern\moto\include" PreprocessorDefinitions="WIN32,_LIB,EXP_PYTHON_EMBEDDING" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/make/msvc_7_0/gameengine/gameplayer/axctl/GP_axctl.vcproj b/make/msvc_7_0/gameengine/gameplayer/axctl/GP_axctl.vcproj index 7174d70a8b0..90c84ee0889 100644 --- a/make/msvc_7_0/gameengine/gameplayer/axctl/GP_axctl.vcproj +++ b/make/msvc_7_0/gameengine/gameplayer/axctl/GP_axctl.vcproj @@ -23,7 +23,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)lib\windows\python\include\python2.2";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)intern\bmfont";"$(SolutionDir)intern\string";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\ketsji";"$(SolutionDir)source\gameengine\ketsji\kxnetwork";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)source\gameengine\scenegraph";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\network\loopbacknetwork";"$(SolutionDir)source\sumo\include";"$(SolutionDir)intern\moto\include";"$(SolutionDir)source\sumo\fuzzics\include";"$(SolutionDir)lib\windows\openal\include";"$(SolutionDir)source\gameengine\gameplayer\common";"$(SolutionDir)source/blender/blenkernel";"$(SolutionDir)source/blender/makesdna";"$(SolutionDir)source/blender/blenlib";"$(SolutionDir)source/blender/blenloader";"$(SolutionDir)source/blender/render/extern/include";"$(SolutionDir)source/blender/imbuf";"$(SolutionDir)source\gameengine\converter";"$(SolutionDir)source\gameengine\GamePlayer\common";"$(SolutionDir)source\gameengine\GamePlayer\common\windows";"$(SolutionDir)intern\iksolver\extern"" + AdditionalIncludeDirectories=""$(SolutionDir)..\lib\windows\python\include\python2.2";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)intern\bmfont";"$(SolutionDir)intern\string";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\ketsji";"$(SolutionDir)source\gameengine\ketsji\kxnetwork";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)source\gameengine\scenegraph";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\network\loopbacknetwork";"$(SolutionDir)source\sumo\include";"$(SolutionDir)intern\moto\include";"$(SolutionDir)source\sumo\fuzzics\include";"$(SolutionDir)..\lib\windows\openal\include";"$(SolutionDir)source\gameengine\gameplayer\common";"$(SolutionDir)source/blender/blenkernel";"$(SolutionDir)source/blender/makesdna";"$(SolutionDir)source/blender/blenlib";"$(SolutionDir)source/blender/blenloader";"$(SolutionDir)source/blender/render/extern/include";"$(SolutionDir)source/blender/imbuf";"$(SolutionDir)source\gameengine\converter";"$(SolutionDir)source\gameengine\GamePlayer\common";"$(SolutionDir)source\gameengine\GamePlayer\common\windows";"$(SolutionDir)intern\iksolver\extern"" PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -46,7 +46,7 @@ OutputFile="$(SolutionDir)obj\windows\debug\Blender3DPlugin.ocx" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\ode\lib\mt_dll,$(SolutionDir)lib\windows\openal\lib,$(SolutionDir)lib\windows\guardedalloc\lib,$(SolutionDir)lib\windows\moto\lib,$(SolutionDir)../../../../../lib/windows/bmfont/lib,$(SolutionDir)../../../../../lib/windows/string/lib,$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)lib\windows\openssl\lib\mt_dll,$(SolutionDir)lib\windows\jpeg\lib,$(SolutionDir)lib\windows\bmfont/lib,$(SolutionDir)lib\windows\string\lib,$(SolutionDir)lib\windows\python\lib,$(SolutionDir)lib\windows\openssl\lib\,$(SolutionDir)lib\windows\zlib\lib\,$(SolutionDir)lib\windows\blenkey\lib\,$(SolutionDir)lib\windows\png\lib" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\ode\lib\mt_dll,$(SolutionDir)..\lib\windows\openal\lib,$(SolutionDir)..\lib\windows\guardedalloc\lib,$(SolutionDir)..\lib\windows\moto\lib,$(SolutionDir)../../../../../lib/windows/bmfont/lib,$(SolutionDir)../../../../../lib/windows/string/lib,$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)..\lib\windows\openssl\lib\mt_dll,$(SolutionDir)..\lib\windows\jpeg\lib,$(SolutionDir)..\lib\windows\bmfont/lib,$(SolutionDir)..\lib\windows\string\lib,$(SolutionDir)..\lib\windows\python\lib,$(SolutionDir)..\lib\windows\openssl\lib\,$(SolutionDir)..\lib\windows\zlib\lib\,$(SolutionDir)..\lib\windows\blenkey\lib\,$(SolutionDir)..\lib\windows\png\lib" IgnoreDefaultLibraryNames="libc.lib,libcmt.lib,msvcrt.lib" ModuleDefinitionFile="$(SolutionDir)source\gameengine\GamePlayer\ActiveX\BlenderPlayer.def" GenerateDebugInformation="TRUE" @@ -86,7 +86,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\bmfont,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\GamePlayer\common,$(SolutionDir)source\gameengine\GamePlayer\common\windows,$(SolutionDir)lib\windows\iksolver\include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)intern\bmfont,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\GamePlayer\common,$(SolutionDir)source\gameengine\GamePlayer\common\windows,$(SolutionDir)..\lib\windows\iksolver\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" @@ -108,7 +108,7 @@ OutputFile="$(SolutionDir)obj\windows\Blender3DPlugin.ocx" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\ode\lib\mt_dll,$(SolutionDir)lib\windows\openal\lib,$(SolutionDir)lib\windows\guardedalloc\lib,$(SolutionDir)lib\windows\moto\lib,$(SolutionDir)lib\windows\bmfont/lib,$(SolutionDir)lib\windows\string\lib,$(SolutionDir)lib\windows\python\lib,$(SolutionDir)lib\windows\openssl\lib\mt_dll,$(SolutionDir)lib\windows\jpeg\lib,$(SolutionDir)lib\windows\zlib\lib\,$(SolutionDir)lib\windows\blenkey\lib\,$(SolutionDir)lib\windows\png\lib" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\ode\lib\mt_dll,$(SolutionDir)..\lib\windows\openal\lib,$(SolutionDir)..\lib\windows\guardedalloc\lib,$(SolutionDir)..\lib\windows\moto\lib,$(SolutionDir)..\lib\windows\bmfont/lib,$(SolutionDir)..\lib\windows\string\lib,$(SolutionDir)..\lib\windows\python\lib,$(SolutionDir)..\lib\windows\openssl\lib\mt_dll,$(SolutionDir)..\lib\windows\jpeg\lib,$(SolutionDir)..\lib\windows\zlib\lib\,$(SolutionDir)..\lib\windows\blenkey\lib\,$(SolutionDir)..\lib\windows\png\lib" IgnoreDefaultLibraryNames="libc.lib,libcmt.lib,msvcrtd.lib" ModuleDefinitionFile="$(SolutionDir)source\gameengine\GamePlayer\ActiveX\BlenderPlayer.def" ProgramDatabaseFile="$(SolutionDir)obj\windows\gameengine\gameplayer\axctl\mtdll/Blender3DPlugin.pdb" diff --git a/make/msvc_7_0/gameengine/gameplayer/common/GP_common.vcproj b/make/msvc_7_0/gameengine/gameplayer/common/GP_common.vcproj index aa1e0b72450..812e36259b6 100644 --- a/make/msvc_7_0/gameengine/gameplayer/common/GP_common.vcproj +++ b/make/msvc_7_0/gameengine/gameplayer/common/GP_common.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python1.5,$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\gameengine\Converter,$(SolutionDir)source\gameengine\soundsystem\snd_dummy,$(SolutionDir)intern\bmfont,$(SolutionDir)intern\string,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\GamePlayer\common\,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python1.5,$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\gameengine\Converter,$(SolutionDir)source\gameengine\soundsystem\snd_dummy,$(SolutionDir)intern\bmfont,$(SolutionDir)intern\string,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\GamePlayer\common\,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)lib\windows\python\include\python2.2";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\gameengine\Converter";"$(SolutionDir)source\gameengine\soundsystem\snd_dummy";"$(SolutionDir)intern\bmfont";"$(SolutionDir)intern\string";"$(SolutionDir)intern\string";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\ketsji";"$(SolutionDir)source\gameengine\GamePlayer\common\";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\ketsji\kxnetwork";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)source\gameengine\scenegraph";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\network\loopbacknetwork";"$(SolutionDir)source\sumo\include";"$(SolutionDir)intern\moto\include";"$(SolutionDir)source\sumo\fuzzics\include";"$(SolutionDir)lib\windows\openal\include";"$(SolutionDir)source/blender/blenkernel";"$(SolutionDir)source/blender/makesdna";"$(SolutionDir)source/blender/blenlib";"$(SolutionDir)source/blender/blenloader";"$(SolutionDir)source/blender/render/extern/include";"$(SolutionDir)source/blender/imbuf"" + AdditionalIncludeDirectories=""$(SolutionDir)..\lib\windows\python\include\python2.2";"$(SolutionDir)intern\guardedalloc";"$(SolutionDir)source\gameengine\Converter";"$(SolutionDir)source\gameengine\soundsystem\snd_dummy";"$(SolutionDir)intern\bmfont";"$(SolutionDir)intern\string";"$(SolutionDir)intern\string";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\ketsji";"$(SolutionDir)source\gameengine\GamePlayer\common\";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\ketsji\kxnetwork";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)source\gameengine\scenegraph";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\network\loopbacknetwork";"$(SolutionDir)source\sumo\include";"$(SolutionDir)intern\moto\include";"$(SolutionDir)source\sumo\fuzzics\include";"$(SolutionDir)..\lib\windows\openal\include";"$(SolutionDir)source/blender/blenkernel";"$(SolutionDir)source/blender/makesdna";"$(SolutionDir)source/blender/blenlib";"$(SolutionDir)source/blender/blenloader";"$(SolutionDir)source/blender/render/extern/include";"$(SolutionDir)source/blender/imbuf"" PreprocessorDefinitions="WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -113,7 +113,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\gameengine\Converter,$(SolutionDir)source\gameengine\soundsystem\snd_dummy,$(SolutionDir)intern\bmfont,$(SolutionDir)intern\string,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\GamePlayer\common\,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\gameengine\Converter,$(SolutionDir)source\gameengine\soundsystem\snd_dummy,$(SolutionDir)intern\bmfont,$(SolutionDir)intern\string,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\GamePlayer\common\,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf" PreprocessorDefinitions="WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -158,7 +158,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\gameengine\Converter,$(SolutionDir)source\gameengine\soundsystem\snd_dummy,$(SolutionDir)intern\bmfont,$(SolutionDir)intern\string,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\GamePlayer\common\,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\guardedalloc,$(SolutionDir)source\gameengine\Converter,$(SolutionDir)source\gameengine\soundsystem\snd_dummy,$(SolutionDir)intern\bmfont,$(SolutionDir)intern\string,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\GamePlayer\common\,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/gameengine/gameplayer/ghost/GP_ghost.vcproj b/make/msvc_7_0/gameengine/gameplayer/ghost/GP_ghost.vcproj index c40b62b94f7..1a09ee8c12e 100644 --- a/make/msvc_7_0/gameengine/gameplayer/ghost/GP_ghost.vcproj +++ b/make/msvc_7_0/gameengine/gameplayer/ghost/GP_ghost.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\ode\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\gameengine\Physics\Ode,$(SolutionDir)source\gameengine\Physics,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\bmfont,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/readblenfile,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)intern\string,$(SolutionDir)lib\windows\ghost\include,$(SolutionDir)lib\windows\iksolver\include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\ode\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\gameengine\Physics\Ode,$(SolutionDir)source\gameengine\Physics,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\bmfont,$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/readblenfile,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)intern\string,$(SolutionDir)..\lib\windows\ghost\include,$(SolutionDir)..\lib\windows\iksolver\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" @@ -44,7 +44,7 @@ OutputFile="$(SolutionDir)obj\windows\blenderplayer.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\ode\lib,$(SolutionDir)lib\windows\bmfont\lib,$(SolutionDir)lib\windows\guardedalloc\lib,$(SolutionDir)lib\windows\string\lib,$(SolutionDir)lib\windows\ghost\lib,$(SolutionDir)lib\windows\jpeg/lib,$(SolutionDir)lib\windows\moto\lib\,$(SolutionDir)lib\windows\png\lib,$(SolutionDir)lib\windows\zlib\lib,$(SolutionDir)lib\windows\ode-0.03\lib,$(SolutionDir)../../../../../lib/windows/fmod/lib,$(SolutionDir)lib\windows\python\lib,$(SolutionDir)../../../../../lib/windows/openal/lib,$(SolutionDir)lib\windows\openssl\lib,$(SolutionDir)lib\windows\blenkey\lib\" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\ode\lib,$(SolutionDir)..\lib\windows\bmfont\lib,$(SolutionDir)..\lib\windows\guardedalloc\lib,$(SolutionDir)..\lib\windows\string\lib,$(SolutionDir)..\lib\windows\ghost\lib,$(SolutionDir)..\lib\windows\jpeg/lib,$(SolutionDir)..\lib\windows\moto\lib\,$(SolutionDir)..\lib\windows\png\lib,$(SolutionDir)..\lib\windows\zlib\lib,$(SolutionDir)..\lib\windows\ode-0.03\lib,$(SolutionDir)../../../../../lib/windows/fmod/lib,$(SolutionDir)..\lib\windows\python\lib,$(SolutionDir)../../../../../lib/windows/openal/lib,$(SolutionDir)..\lib\windows\openssl\lib,$(SolutionDir)..\lib\windows\blenkey\lib\" IgnoreDefaultLibraryNames="libcd.lib,libc.lib,msvcrt.lib,msvcrtd.lib,msvcprt.lib" ProgramDatabaseFile="$(SolutionDir)obj\windows/blenderplayer.pdb" SubSystem="1"/> @@ -77,7 +77,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)intern\moto\include";"$(SolutionDir)source\gameengine\Physics\Ode";"$(SolutionDir)source\gameengine\Physics";"$(SolutionDir)lib\windows\python\include\python2.2";"$(SolutionDir)intern\bmfont";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\ketsji";"$(SolutionDir)source\gameengine\ketsji\kxnetwork";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)source\gameengine\scenegraph";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\network\loopbacknetwork";"$(SolutionDir)source\sumo\include";"$(SolutionDir)source\sumo\fuzzics\include";"$(SolutionDir)lib\windows\openal\include";"$(SolutionDir)source\gameengine\gameplayer\common";"$(SolutionDir)source/blender/blenkernel";"$(SolutionDir)source/blender/makesdna";"$(SolutionDir)source/blender/blenlib";"$(SolutionDir)source/blender/blenloader";"$(SolutionDir)source/blender/readblenfile";"$(SolutionDir)source/blender/render/extern/include";"$(SolutionDir)source/blender/imbuf";"$(SolutionDir)source\gameengine\converter";"$(SolutionDir)source\gameengine\gameplayer\common\windows";"$(SolutionDir)intern\string";"$(SolutionDir)intern\ghost";"$(SolutionDir)intern\iksolver\extern"" + AdditionalIncludeDirectories=""$(SolutionDir)intern\moto\include";"$(SolutionDir)source\gameengine\Physics\Ode";"$(SolutionDir)source\gameengine\Physics";"$(SolutionDir)..\lib\windows\python\include\python2.2";"$(SolutionDir)intern\bmfont";"$(SolutionDir)source\kernel\gen_messaging";"$(SolutionDir)source\kernel\gen_system";"$(SolutionDir)source\gameengine\expressions";"$(SolutionDir)source\gameengine\ketsji";"$(SolutionDir)source\gameengine\ketsji\kxnetwork";"$(SolutionDir)source\gameengine\rasterizer";"$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer";"$(SolutionDir)source\gameengine\scenegraph";"$(SolutionDir)source\gameengine\gamelogic";"$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source\gameengine\soundsystem\snd_openal";"$(SolutionDir)source\gameengine\network";"$(SolutionDir)source\gameengine\network\loopbacknetwork";"$(SolutionDir)source\sumo\include";"$(SolutionDir)source\sumo\fuzzics\include";"$(SolutionDir)..\lib\windows\openal\include";"$(SolutionDir)source\gameengine\gameplayer\common";"$(SolutionDir)source/blender/blenkernel";"$(SolutionDir)source/blender/makesdna";"$(SolutionDir)source/blender/blenlib";"$(SolutionDir)source/blender/blenloader";"$(SolutionDir)source/blender/readblenfile";"$(SolutionDir)source/blender/render/extern/include";"$(SolutionDir)source/blender/imbuf";"$(SolutionDir)source\gameengine\converter";"$(SolutionDir)source\gameengine\gameplayer\common\windows";"$(SolutionDir)intern\string";"$(SolutionDir)intern\ghost";"$(SolutionDir)intern\iksolver\extern"" PreprocessorDefinitions="WIN32,_CONSOLE,dSINGLE" RuntimeLibrary="1" UsePrecompiledHeader="0" @@ -99,7 +99,7 @@ OutputFile="$(SolutionDir)obj\windows\debug\blenderplayer.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\ode\lib,$(SolutionDir)lib\windows\bmfont\lib\,$(SolutionDir)lib\windows\guardedalloc\lib,$(SolutionDir)lib\windows\string\lib\,$(SolutionDir)lib\windows\ghost\lib\,$(SolutionDir)lib\windows\jpeg\lib,$(SolutionDir)lib\windows\moto\lib\,$(SolutionDir)lib\windows\zlib\lib\,$(SolutionDir)lib\windows\png\lib\,$(SolutionDir)lib\windows\ode-0.03\lib,$(SolutionDir)../../../../../lib/windows/fmod/lib,$(SolutionDir)lib\windows\python\lib,$(SolutionDir)../../../../../lib/windows/openal/lib,$(SolutionDir)lib\windows\openssl\lib,$(SolutionDir)lib\windows\blenkey\lib\" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\ode\lib,$(SolutionDir)..\lib\windows\bmfont\lib\,$(SolutionDir)..\lib\windows\guardedalloc\lib,$(SolutionDir)..\lib\windows\string\lib\,$(SolutionDir)..\lib\windows\ghost\lib\,$(SolutionDir)..\lib\windows\jpeg\lib,$(SolutionDir)..\lib\windows\moto\lib\,$(SolutionDir)..\lib\windows\zlib\lib\,$(SolutionDir)..\lib\windows\png\lib\,$(SolutionDir)..\lib\windows\ode-0.03\lib,$(SolutionDir)../../../../../lib/windows/fmod/lib,$(SolutionDir)..\lib\windows\python\lib,$(SolutionDir)../../../../../lib/windows/openal/lib,$(SolutionDir)..\lib\windows\openssl\lib,$(SolutionDir)..\lib\windows\blenkey\lib\" IgnoreDefaultLibraryNames="libcd.lib,libc.lib,libcmt.lib,msvcrt.lib,msvcrtd.lib,msvcprtd.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(SolutionDir)obj\windows\debug/blenderplayer.pdb" diff --git a/make/msvc_7_0/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.vcproj b/make/msvc_7_0/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.vcproj index 51996d86580..795d615599b 100644 --- a/make/msvc_7_0/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.vcproj +++ b/make/msvc_7_0/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib/windows/python/include/python2.0,$(SolutionDir)source/blender/encrypt,$(SolutionDir)source/blender/blenkernel,$(SolutionDir)source/blender/makesdna,$(SolutionDir)source/blender/blenlib,$(SolutionDir)source/blender/blenloader,$(SolutionDir)source/blender/render/extern/include,$(SolutionDir)source/gameengine/Rasterizer,$(SolutionDir)lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)source/gameengine/GameLogic,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source/blender/imbuf,$(SolutionDir)source/gameengine/SoundSystem,$(SolutionDir)source/gameengine/SoundSystem/SND_OpenAL,$(SolutionDir)source/gameengine/Ketsji,$(SolutionDir)source/gameengine/Expressions,$(SolutionDir)source/gameengine/SceneGraph,$(SolutionDir)source/gameengine/ketsji/kxnetwork,$(SolutionDir)source/gameengine/network,$(SolutionDir)source/gameengine/network/loopbacknetwork,$(SolutionDir)source/gameengine/GamePlayer/common,$(SolutionDir)lib/windows/iksolver/include,$(SolutionDir)source/gameengine/SoundSystem/SND_Dummy" + AdditionalIncludeDirectories="$(SolutionDir)..\lib/windows/python/include/python2.0,$(SolutionDir)source/blender/encrypt,$(SolutionDir)source/blender/blenkernel,$(SolutionDir)source/blender/makesdna,$(SolutionDir)source/blender/blenlib,$(SolutionDir)source/blender/blenloader,$(SolutionDir)source/blender/render/extern/include,$(SolutionDir)source/gameengine/Rasterizer,$(SolutionDir)..\lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)source/gameengine/GameLogic,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source/blender/imbuf,$(SolutionDir)source/gameengine/SoundSystem,$(SolutionDir)source/gameengine/SoundSystem/SND_OpenAL,$(SolutionDir)source/gameengine/Ketsji,$(SolutionDir)source/gameengine/Expressions,$(SolutionDir)source/gameengine/SceneGraph,$(SolutionDir)source/gameengine/ketsji/kxnetwork,$(SolutionDir)source/gameengine/network,$(SolutionDir)source/gameengine/network/loopbacknetwork,$(SolutionDir)source/gameengine/GamePlayer/common,$(SolutionDir)..\lib/windows/iksolver/include,$(SolutionDir)source/gameengine/SoundSystem/SND_Dummy" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="4" @@ -44,7 +44,7 @@ OutputFile="$(SolutionDir)obj\windows\BlenderLoader.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib/windows/moto/lib,$(SolutionDir)lib\windows\guardedalloc\lib,$(SolutionDir)lib/windows/python/lib,$(SolutionDir)lib/windows/jpeg/lib,$(SolutionDir)lib/windows/sdl/SDL-1.1.7\Lib" + AdditionalLibraryDirectories="$(SolutionDir)..\lib/windows/moto/lib,$(SolutionDir)..\lib\windows\guardedalloc\lib,$(SolutionDir)..\lib/windows/python/lib,$(SolutionDir)..\lib/windows/jpeg/lib,$(SolutionDir)..\lib/windows/sdl/SDL-1.1.7\Lib" ProgramDatabaseFile="$(SolutionDir)obj\windows\gameengine\gameplayer\BlenderLoader/BlenderLoader.pdb" SubSystem="1"/> <Tool @@ -76,7 +76,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib/windows/python/include/python1.5,$(SolutionDir)source/blender/encrypt,$(SolutionDir)source/blender/blenkernel,$(SolutionDir)source/blender/makesdna,$(SolutionDir)source/blender/blenlib,$(SolutionDir)source/blender/blenloader,$(SolutionDir)source/blender/render/extern/include,$(SolutionDir)source/gameengine/Rasterizer,$(SolutionDir)lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)source/gameengine/GameLogic,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)../../../../../source/blender/imbuf,$(SolutionDir)../../../../../source/gameengine/SoundSystem,source/gameengine/SoundSystem/SND_OpenAL,$(SolutionDir)source/gameengine/Ketsji,$(SolutionDir)source/gameengine/Expressions,$(SolutionDir)source/gameengine/SceneGraph,$(SolutionDir)source/gameengine/ketsji/kxnetwork,$(SolutionDir)source/gameengine/network,$(SolutionDir)source/gameengine/network/loopbacknetwork,$(SolutionDir)source/gameengine/GamePlayer/common,$(SolutionDir)lib/windows/iksolver/include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib/windows/python/include/python1.5,$(SolutionDir)source/blender/encrypt,$(SolutionDir)source/blender/blenkernel,$(SolutionDir)source/blender/makesdna,$(SolutionDir)source/blender/blenlib,$(SolutionDir)source/blender/blenloader,$(SolutionDir)source/blender/render/extern/include,$(SolutionDir)source/gameengine/Rasterizer,$(SolutionDir)..\lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)source/gameengine/GameLogic,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)../../../../../source/blender/imbuf,$(SolutionDir)../../../../../source/gameengine/SoundSystem,source/gameengine/SoundSystem/SND_OpenAL,$(SolutionDir)source/gameengine/Ketsji,$(SolutionDir)source/gameengine/Expressions,$(SolutionDir)source/gameengine/SceneGraph,$(SolutionDir)source/gameengine/ketsji/kxnetwork,$(SolutionDir)source/gameengine/network,$(SolutionDir)source/gameengine/network/loopbacknetwork,$(SolutionDir)source/gameengine/GamePlayer/common,$(SolutionDir)..\lib/windows/iksolver/include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="5" @@ -99,7 +99,7 @@ OutputFile="$(SolutionDir)obj\windows\profile\BlenderLoader.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\guardedalloc\lib,$(SolutionDir)lib/windows/python/lib,$(SolutionDir)lib/windows/jpeg/lib,$(SolutionDir)lib/windows/sdl/SDL-1.1.7\Lib" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\guardedalloc\lib,$(SolutionDir)..\lib/windows/python/lib,$(SolutionDir)..\lib/windows/jpeg/lib,$(SolutionDir)..\lib/windows/sdl/SDL-1.1.7\Lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\BlenderLoader___Win32_Profile/BlenderLoader.pdb" SubSystem="1"/> @@ -132,7 +132,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib/windows/python/include/python1.5,$(SolutionDir)source/blender/encrypt,$(SolutionDir)source/blender/blenkernel,$(SolutionDir)source/blender/makesdna,$(SolutionDir)source/blender/blenlib,$(SolutionDir)source/blender/blenloader,$(SolutionDir)source/blender/render/extern/include,$(SolutionDir)source/gameengine/Rasterizer,lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)source/gameengine/GameLogic,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source/blender/imbuf,$(SolutionDir)source/gameengine/SoundSystem,$(SolutionDir)source/gameengine/SoundSystem/SND_OpenAL,$(SolutionDir)source/gameengine/Ketsji,$(SolutionDir)source/gameengine/Expressions,$(SolutionDir)source/gameengine/SceneGraph,$(SolutionDir)source/gameengine/ketsji/kxnetwork,$(SolutionDir)source/gameengine/network,$(SolutionDir)source/gameengine/network/loopbacknetwork,$(SolutionDir)source/gameengine/GamePlayer/common,$(SolutionDir)lib/windows/iksolver/include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib/windows/python/include/python1.5,$(SolutionDir)source/blender/encrypt,$(SolutionDir)source/blender/blenkernel,$(SolutionDir)source/blender/makesdna,$(SolutionDir)source/blender/blenlib,$(SolutionDir)source/blender/blenloader,$(SolutionDir)source/blender/render/extern/include,$(SolutionDir)source/gameengine/Rasterizer,lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)source/gameengine/GameLogic,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source/blender/imbuf,$(SolutionDir)source/gameengine/SoundSystem,$(SolutionDir)source/gameengine/SoundSystem/SND_OpenAL,$(SolutionDir)source/gameengine/Ketsji,$(SolutionDir)source/gameengine/Expressions,$(SolutionDir)source/gameengine/SceneGraph,$(SolutionDir)source/gameengine/ketsji/kxnetwork,$(SolutionDir)source/gameengine/network,$(SolutionDir)source/gameengine/network/loopbacknetwork,$(SolutionDir)source/gameengine/GamePlayer/common,$(SolutionDir)..\lib/windows/iksolver/include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -155,7 +155,7 @@ OutputFile="$(SolutionDir)obj\windows\debug\BlenderLoader.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\guardedalloc\lib,$(SolutionDir)lib/windows/python/lib,$(SolutionDir)lib/windows/jpeg/lib,$(SolutionDir)lib/windows/sdl/SDL-1.1.7\Lib" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\guardedalloc\lib,$(SolutionDir)..\lib/windows/python/lib,$(SolutionDir)..\lib/windows/jpeg/lib,$(SolutionDir)..\lib/windows/sdl/SDL-1.1.7\Lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(SolutionDir)obj\windows\gameengine\gameplayer\BlenderLoader\debug/BlenderLoader.pdb" SubSystem="1"/> @@ -219,37 +219,37 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> </Filter> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\alc\ALc.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\alc\ALc.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\alu\ALu.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\alu\ALu.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\alut\ALut.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\alut\ALut.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\OpenAL32.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\OpenAL32.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alBuffer.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alBuffer.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alEax.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alEax.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alError.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alError.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alExtension.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alExtension.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alListener.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alListener.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alSource.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alSource.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alState.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alState.obj"> </File> </Files> <Globals> diff --git a/make/msvc_7_0/gameengine/gameplayer/netscape/GP_netscape.vcproj b/make/msvc_7_0/gameengine/gameplayer/netscape/GP_netscape.vcproj index b091ccd1931..7ae2bdc9029 100644 --- a/make/msvc_7_0/gameengine/gameplayer/netscape/GP_netscape.vcproj +++ b/make/msvc_7_0/gameengine/gameplayer/netscape/GP_netscape.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)lib\windows\iksolver\include,$(SolutionDir)../../../../../intern\moto\include" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)..\lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)..\lib\windows\iksolver\include,$(SolutionDir)../../../../../intern\moto\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" RuntimeLibrary="5" UsePrecompiledHeader="2" @@ -43,7 +43,7 @@ OutputFile="C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)../../../../../lib/windows/jpeg/lib,$(SolutionDir)../../../../../lib/windows/openal/lib,$(SolutionDir)../../../../../lib/windows/zlib/lib/,$(SolutionDir)lib\windows\blenkey\lib,$(SolutionDir)lib\windows\openssl\lib,$(SolutionDir)lib\windows\iksolver\lib\" + AdditionalLibraryDirectories="$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)../../../../../lib/windows/jpeg/lib,$(SolutionDir)../../../../../lib/windows/openal/lib,$(SolutionDir)../../../../../lib/windows/zlib/lib/,$(SolutionDir)..\lib\windows\blenkey\lib,$(SolutionDir)..\lib\windows\openssl\lib,$(SolutionDir)..\lib\windows\iksolver\lib\" ModuleDefinitionFile="$(SolutionDir)source\gameengine\GamePlayer\Netscape\windows\npblender.def" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\Program Files\Netscape\Communicator\Program\Plugins/NPBlender.pdb" @@ -81,7 +81,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)source\gameengine\GamePlayer\Netscape\windows_sdk,$(SolutionDir)lib\windows\iksolver\include,$(SolutionDir)../../../../../intern\moto\include" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)source\gameengine\GamePlayer\Netscape\windows_sdk,$(SolutionDir)..\lib\windows\iksolver\include,$(SolutionDir)../../../../../intern\moto\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="4" @@ -103,7 +103,7 @@ OutputFile="C:\Program Files\Netscape\Communicator\Program\Plugins\NPBlender.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)../../../../../lib/windows/jpeg/lib,$(SolutionDir)../../../../../lib/windows/zlib/lib/,$(SolutionDir)lib\windows\blenkey\lib,$(SolutionDir)lib\windows\openssl\lib,$(SolutionDir)lib\windows\iksolver\lib\" + AdditionalLibraryDirectories="$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)../../../../../lib/windows/jpeg/lib,$(SolutionDir)../../../../../lib/windows/zlib/lib/,$(SolutionDir)..\lib\windows\blenkey\lib,$(SolutionDir)..\lib\windows\openssl\lib,$(SolutionDir)..\lib\windows\iksolver\lib\" ModuleDefinitionFile="$(SolutionDir)source\gameengine\GamePlayer\Netscape\windows\npblender.def" ProgramDatabaseFile="C:\Program Files\Netscape\Communicator\Program\Plugins/NPBlender.pdb" SubSystem="2" @@ -140,7 +140,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)..\lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="5" diff --git a/make/msvc_7_0/gameengine/gameplayer/netscape2/GP_netscape.vcproj b/make/msvc_7_0/gameengine/gameplayer/netscape2/GP_netscape.vcproj index 472d8723880..2919b875ce9 100644 --- a/make/msvc_7_0/gameengine/gameplayer/netscape2/GP_netscape.vcproj +++ b/make/msvc_7_0/gameengine/gameplayer/netscape2/GP_netscape.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape2\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)source\gameengine\gameplayer\Netscape2\windows,$(SolutionDir)lib\windows\iksolver\include" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape2\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)..\lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)source\gameengine\gameplayer\Netscape2\windows,$(SolutionDir)..\lib\windows\iksolver\include" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" RuntimeLibrary="5" UsePrecompiledHeader="2" @@ -43,7 +43,7 @@ OutputFile="C:\Program Files\Netscape\Communicator\Program\Plugins\npBlender3DPlugin.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)../../../../../lib/windows/jpeg/lib,$(SolutionDir)../../../../../lib/windows/openal/lib,$(SolutionDir)../../../../../lib/windows/zlib/lib/,$(SolutionDir)lib\windows\blenkey\lib,$(SolutionDir)lib\windows\openssl\lib,$(SolutionDir)lib\windows\iksolver\lib\" + AdditionalLibraryDirectories="$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)../../../../../lib/windows/jpeg/lib,$(SolutionDir)../../../../../lib/windows/openal/lib,$(SolutionDir)../../../../../lib/windows/zlib/lib/,$(SolutionDir)..\lib\windows\blenkey\lib,$(SolutionDir)..\lib\windows\openssl\lib,$(SolutionDir)..\lib\windows\iksolver\lib\" ModuleDefinitionFile="$(SolutionDir)source\gameengine\GamePlayer\Netscape2\windows\npblender.def" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\Program Files\Netscape\Communicator\Program\Plugins/npBlender3DPlugin.pdb" @@ -81,7 +81,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape2\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)source\gameengine\gameplayer\Netscape2\windows,$(SolutionDir)lib\windows\iksolver\include" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape2\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)..\lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)source\gameengine\gameplayer\Netscape2\windows,$(SolutionDir)..\lib\windows\iksolver\include" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="4" @@ -103,7 +103,7 @@ OutputFile="C:\Program Files\Netscape\Communicator\Program\Plugins\npBlender3DPlugin.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)../../../../../lib/windows/jpeg/lib,$(SolutionDir)../../../../../lib/windows/zlib/lib/,$(SolutionDir)lib\windows\blenkey\lib,$(SolutionDir)lib\windows\openssl\lib,$(SolutionDir)lib\windows\iksolver\lib\,$(SolutionDir)../../../../../lib/windows/openal/lib" + AdditionalLibraryDirectories="$(SolutionDir)../../../../../lib/windows/python/lib,$(SolutionDir)../../../../../lib/windows/jpeg/lib,$(SolutionDir)../../../../../lib/windows/zlib/lib/,$(SolutionDir)..\lib\windows\blenkey\lib,$(SolutionDir)..\lib\windows\openssl\lib,$(SolutionDir)..\lib\windows\iksolver\lib\,$(SolutionDir)../../../../../lib/windows/openal/lib" ModuleDefinitionFile="$(SolutionDir)source\gameengine\GamePlayer\Netscape2\windows\npblender.def" ProgramDatabaseFile="C:\Program Files\Netscape\Communicator\Program\Plugins/npBlender3DPlugin.pdb" SubSystem="2" @@ -140,7 +140,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape2\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)source\gameengine\gameplayer\Netscape2\windows,$(SolutionDir)lib\windows\iksolver\include" + AdditionalIncludeDirectories="$(SolutionDir)source\kernel\gen_messaging,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\rasterizer\ras_openglrasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\snd_openal,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\GamePlayer\Netscape2\windows_sdk,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)..\lib\windows\python\include\python1.5,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)../../../../source/blender/blenkernel,$(SolutionDir)../../../../source/blender/makesdna,$(SolutionDir)../../../../source/blender/blenlib,$(SolutionDir)../../../../source/blender/blenloader,$(SolutionDir)../../../../source/blender/render/extern/include,$(SolutionDir)../../../../source/blender/imbuf,$(SolutionDir)source\gameengine\converter,$(SolutionDir)source\gameengine\gameplayer\common\windows,$(SolutionDir)source\gameengine\gameplayer\Netscape2\windows,$(SolutionDir)..\lib\windows\iksolver\include" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="5" diff --git a/make/msvc_7_0/gameengine/gameplayer/qt/gp.vcproj b/make/msvc_7_0/gameengine/gameplayer/qt/gp.vcproj index da263d944e7..1afecbe3625 100644 --- a/make/msvc_7_0/gameengine/gameplayer/qt/gp.vcproj +++ b/make/msvc_7_0/gameengine/gameplayer/qt/gp.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="h:\qtwin\include,$(SolutionDir)source\gameengine\Expressions,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\Ketsji\KXNetwork,$(SolutionDir)source\gameengine\Network,$(SolutionDir)source\gameengine\Network\LoopBackNetwork,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\gameengine\Rasterizer\RAS_OpenGLRasterizer,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)lib\windows\python\include\python2.0" + AdditionalIncludeDirectories="h:\qtwin\include,$(SolutionDir)source\gameengine\Expressions,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\Ketsji\KXNetwork,$(SolutionDir)source\gameengine\Network,$(SolutionDir)source\gameengine\Network\LoopBackNetwork,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\gameengine\Rasterizer\RAS_OpenGLRasterizer,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)..\lib\windows\python\include\python2.0" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS" StringPooling="TRUE" RuntimeLibrary="4" @@ -43,7 +43,7 @@ OutputFile="$(SolutionDir)obj\windows\gp.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\python\lib\" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\python\lib\" ProgramDatabaseFile="$(SolutionDir)obj\windows\gameengine\gameplayer\qt\gp/gp.pdb" SubSystem="2"/> <Tool @@ -78,7 +78,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="h:\qtwin\include,$(SolutionDir)source\gameengine\Expressions,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\Ketsji\KXNetwork,$(SolutionDir)source\gameengine\Network,$(SolutionDir)source\gameengine\Network\LoopBackNetwork,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\gameengine\Rasterizer\RAS_OpenGLRasterizer,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)lib\windows\python\include\python1.5" + AdditionalIncludeDirectories="h:\qtwin\include,$(SolutionDir)source\gameengine\Expressions,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\Ketsji\KXNetwork,$(SolutionDir)source\gameengine\Network,$(SolutionDir)source\gameengine\Network\LoopBackNetwork,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\gameengine\Rasterizer\RAS_OpenGLRasterizer,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)..\lib\windows\python\include\python1.5" PreprocessorDefinitions="_DEBUG,WIN32" RuntimeLibrary="5" PrecompiledHeaderFile="$(SolutionDir)obj\windows\gameengine\gameplayer\qt\gp\debug/gp.pch" @@ -97,7 +97,7 @@ OutputFile="$(SolutionDir)obj\windows\debug\gp.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\python\lib\" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\python\lib\" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(SolutionDir)obj\windows\gameengine\gameplayer\qt\gp\debug/gp.pdb" SubSystem="2"/> diff --git a/make/msvc_7_0/gameengine/gameplayer/qt/gpplugin.vcproj b/make/msvc_7_0/gameengine/gameplayer/qt/gpplugin.vcproj index b04e03e1b05..c60fe59ee03 100644 --- a/make/msvc_7_0/gameengine/gameplayer/qt/gpplugin.vcproj +++ b/make/msvc_7_0/gameengine/gameplayer/qt/gpplugin.vcproj @@ -20,7 +20,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="h:\qtwin\include,$(SolutionDir)source\gameengine\Expressions,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\Ketsji\KXNetwork,$(SolutionDir)source\gameengine\Network,$(SolutionDir)source\gameengine\Network\LoopBackNetwork,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\gameengine\Rasterizer\RAS_OpenGLRasterizer,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)lib\windows\python\include\python1.5" + AdditionalIncludeDirectories="h:\qtwin\include,$(SolutionDir)source\gameengine\Expressions,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\Ketsji\KXNetwork,$(SolutionDir)source\gameengine\Network,$(SolutionDir)source\gameengine\Network\LoopBackNetwork,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\gameengine\Rasterizer\RAS_OpenGLRasterizer,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)..\lib\windows\python\include\python1.5" PreprocessorDefinitions="WIN32;PLUGIN;_DEBUG" RuntimeLibrary="1" PrecompiledHeaderFile="$(SolutionDir)obj\windows\gameengine\gameplayer\qt\gpplugin\debug/gpplugin.pch" @@ -40,7 +40,7 @@ OutputFile="$(SolutionDir)obj\windows\debug\npWebGP.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\python\lib" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\python\lib" ModuleDefinitionFile="$(SolutionDir)source\gameengine\GamePlayer\Qt\GP.def" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(SolutionDir)obj\windows\gameengine\gameplayer\qt\gpplugin\debug/npWebGP.pdb" @@ -78,7 +78,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="h:\qtwin\include,$(SolutionDir)source\gameengine\Expressions,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\Ketsji\KXNetwork,$(SolutionDir)source\gameengine\Network,$(SolutionDir)source\gameengine\Network\LoopBackNetwork,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\gameengine\Rasterizer\RAS_OpenGLRasterizer,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)lib\windows\python\include\python2.0" + AdditionalIncludeDirectories="h:\qtwin\include,$(SolutionDir)source\gameengine\Expressions,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\Ketsji,$(SolutionDir)source\gameengine\Ketsji\KXNetwork,$(SolutionDir)source\gameengine\Network,$(SolutionDir)source\gameengine\Network\LoopBackNetwork,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\gameengine\Rasterizer\RAS_OpenGLRasterizer,$(SolutionDir)source\gameengine\SceneGraph,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)..\lib\windows\python\include\python2.0" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GPPLUGIN_EXPORTS" StringPooling="TRUE" RuntimeLibrary="0" @@ -100,7 +100,7 @@ OutputFile="$(SolutionDir)obj\windows\npWebGP.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\python\lib\" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\python\lib\" ProgramDatabaseFile="$(SolutionDir)obj\windows\gameengine\gameplayer\qt\gpplugin/npWebGP.pdb" ImportLibrary="$(SolutionDir)obj\windows\gameengine\gameplayer\qt\gpplugin/npWebGP.lib"/> <Tool diff --git a/make/msvc_7_0/gameengine/gameplayer/sdl/GP_sdl.vcproj b/make/msvc_7_0/gameengine/gameplayer/sdl/GP_sdl.vcproj index 9258974443a..56fb36f29a2 100644 --- a/make/msvc_7_0/gameengine/gameplayer/sdl/GP_sdl.vcproj +++ b/make/msvc_7_0/gameengine/gameplayer/sdl/GP_sdl.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)lib\windows\python\include\python2.0" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)..\lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)..\lib\windows\python\include\python2.0" PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="4" @@ -44,7 +44,7 @@ OutputFile=".\Release/GP_sdl.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\sdl\sdl-1.1.7\lib,$(SolutionDir)lib\windows\python\lib" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\sdl\sdl-1.1.7\lib,$(SolutionDir)..\lib\windows\python\lib" ProgramDatabaseFile=".\Release/GP_sdl.pdb" SubSystem="1"/> <Tool @@ -76,7 +76,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)lib\windows\python\include\python1.5" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)..\lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)..\lib\windows\python\include\python1.5" PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="5" @@ -99,7 +99,7 @@ OutputFile=".\GP_sdl___Win32_Profile/GP_sdl.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\sdl\sdl-1.1.7\lib,$(SolutionDir)lib\windows\python\lib,$(SolutionDir)lib\windows\openal\lib\lib_release" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\sdl\sdl-1.1.7\lib,$(SolutionDir)..\lib\windows\python\lib,$(SolutionDir)..\lib\windows\openal\lib\lib_release" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\GP_sdl___Win32_Profile/GP_sdl.pdb" SubSystem="1"/> @@ -132,7 +132,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)lib\windows\python\include\python1.5" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\network\loopbacknetwork,$(SolutionDir)source\gameengine\gameplayer\common,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\Rasterizer,$(SolutionDir)source\sumo\include,$(SolutionDir)intern\moto\include,$(SolutionDir)source\sumo\Fuzzics\include,$(SolutionDir)..\lib\windows\sdl\SDL-1.1.7\include,$(SolutionDir)..\lib\windows\python\include\python1.5" PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -155,7 +155,7 @@ OutputFile=".\Debug/GP_sdl.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="$(SolutionDir)lib\windows\sdl\sdl-1.1.7\lib,$(SolutionDir)lib\windows\python\lib,$(SolutionDir)lib\windows\openal\lib\lib_release" + AdditionalLibraryDirectories="$(SolutionDir)..\lib\windows\sdl\sdl-1.1.7\lib,$(SolutionDir)..\lib\windows\python\lib,$(SolutionDir)..\lib\windows\openal\lib\lib_release" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/GP_sdl.pdb" SubSystem="1"/> @@ -219,37 +219,37 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> </Filter> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\alc\ALc.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\alc\ALc.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\alu\ALu.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\alu\ALu.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\alut\ALut.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\alut\ALut.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\OpenAL32.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\OpenAL32.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alBuffer.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alBuffer.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alEax.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alEax.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alError.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alError.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alExtension.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alExtension.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alListener.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alListener.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alSource.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alSource.obj"> </File> <File - RelativePath="$(SolutionDir)lib\windows\openal\lib\OpenAL32\alState.obj"> + RelativePath="$(SolutionDir)..\lib\windows\openal\lib\OpenAL32\alState.obj"> </File> </Files> <Globals> diff --git a/make/msvc_7_0/gameengine/ketsji/KX_ketsji.vcproj b/make/msvc_7_0/gameengine/ketsji/KX_ketsji.vcproj index 6f05cd4ac21..25142257883 100644 --- a/make/msvc_7_0/gameengine/ketsji/KX_ketsji.vcproj +++ b/make/msvc_7_0/gameengine/ketsji/KX_ketsji.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\physics\common\dummy,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)source\gameengine\physics\BlOde" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\physics\common\dummy,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)source\gameengine\physics\BlOde" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING" StringPooling="TRUE" RuntimeLibrary="2" @@ -66,7 +66,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\physics\common\dummy,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)source\gameengine\physics\BlOde" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)source\gameengine\physics\common\dummy,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)source\gameengine\physics\BlOde" PreprocessorDefinitions="WIN32,_LIB,EXP_PYTHON_EMBEDDING" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)source\gameengine\physics\BlOde,$(SolutionDir)source\gameengine\physics\common\dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\sumo\include" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)source\gameengine\physics\BlOde,$(SolutionDir)source\gameengine\physics\common\dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\sumo\include" PreprocessorDefinitions="JANCODEPANCO,WIN32,_LIB,EXP_PYTHON_EMBEDDING" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -159,7 +159,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)source\gameengine\physics\common\dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)source\gameengine\physics\BlOde" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)source\gameengine\physics\common\dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\rasterizer,$(SolutionDir)source\gameengine\scenegraph,$(SolutionDir)source\gameengine\gamelogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\sumo\include,$(SolutionDir)source\sumo\fuzzics\include,$(SolutionDir)source\gameengine\network,$(SolutionDir)source\gameengine\ketsji\kxnetwork,$(SolutionDir)source\gameengine\physics,$(SolutionDir)source\gameengine\physics\common,$(SolutionDir)source\gameengine\physics\dummy,$(SolutionDir)source\gameengine\physics\sumo,$(SolutionDir)source\gameengine\physics\sumo\fuzzics\include,$(SolutionDir)source\gameengine\physics\sumo\include,$(SolutionDir)source\gameengine\physics\BlOde" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING" StringPooling="TRUE" RuntimeLibrary="0" diff --git a/make/msvc_7_0/gameengine/ketsji/network/KX_network.vcproj b/make/msvc_7_0/gameengine/ketsji/network/KX_network.vcproj index b868ffd9c7f..aa343b8abb7 100644 --- a/make/msvc_7_0/gameengine/ketsji/network/KX_network.vcproj +++ b/make/msvc_7_0/gameengine/ketsji/network/KX_network.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\Network" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\Network" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\Network" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\Network" PreprocessorDefinitions="WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -114,7 +114,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.0,$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\Network" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.0,$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\Network" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -159,7 +159,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\Network" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\python\include\python2.2,$(SolutionDir)intern\string,$(SolutionDir)source\gameengine\ketsji,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)source\gameengine\GameLogic,$(SolutionDir)source\gameengine\expressions,$(SolutionDir)source\gameengine\Network" PreprocessorDefinitions="WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/make/msvc_7_0/gameengine/network/terraplaynetwork/NG_terraplaynetwork.vcproj b/make/msvc_7_0/gameengine/network/terraplaynetwork/NG_terraplaynetwork.vcproj index 7506041f544..5a8e87b6b22 100644 --- a/make/msvc_7_0/gameengine/network/terraplaynetwork/NG_terraplaynetwork.vcproj +++ b/make/msvc_7_0/gameengine/network/terraplaynetwork/NG_terraplaynetwork.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)lib\windows\terraplay\include" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)..\lib\windows\terraplay\include" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -69,7 +69,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)lib\windows\terraplay\include" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)..\lib\windows\terraplay\include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -114,7 +114,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)lib\windows\terraplay\include" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)..\lib\windows\terraplay\include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="4" @@ -160,7 +160,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)lib\windows\terraplay\include" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)..\lib\windows\terraplay\include" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="5" @@ -207,7 +207,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)lib\windows\terraplay\include" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\network,$(SolutionDir)source\kernel\gen_system,$(SolutionDir)..\lib\windows\terraplay\include" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/make/msvc_7_0/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj b/make/msvc_7_0/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj index ab325b3edf0..b3af856cead 100644 --- a/make/msvc_7_0/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj +++ b/make/msvc_7_0/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\ode\include,$(SolutionDir)source\gameengine\physics\common" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\ode\include,$(SolutionDir)source\gameengine\physics\common" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -66,7 +66,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\ode\include,$(SolutionDir)source\gameengine\physics\common" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\ode\include,$(SolutionDir)source\gameengine\physics\common" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="4" @@ -111,7 +111,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\ode\include,$(SolutionDir)source\gameengine\physics\common" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\ode\include,$(SolutionDir)source\gameengine\physics\common" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -156,7 +156,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\ode\include,$(SolutionDir)source\gameengine\physics\common" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\ode\include,$(SolutionDir)source\gameengine\physics\common" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/make/msvc_7_0/gameengine/sound/SND_sound.vcproj b/make/msvc_7_0/gameengine/sound/SND_sound.vcproj index 6792bb32721..424361911f7 100644 --- a/make/msvc_7_0/gameengine/sound/SND_sound.vcproj +++ b/make/msvc_7_0/gameengine/sound/SND_sound.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\fmod\include,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\openal,$(SolutionDir)source\gameengine\soundsystem\fmod,$(SolutionDir)source\gameengine\soundsystem\dummy,$(SolutionDir)intern\string,$(SolutionDir)../../../../intern\moto\include,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\fmod\include,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\openal,$(SolutionDir)source\gameengine\soundsystem\fmod,$(SolutionDir)source\gameengine\soundsystem\dummy,$(SolutionDir)intern\string,$(SolutionDir)../../../../intern\moto\include,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -66,7 +66,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\fmod\include,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\openal,$(SolutionDir)source\gameengine\soundsystem\fmod,$(SolutionDir)source\gameengine\soundsystem\dummy,$(SolutionDir)intern\string,$(SolutionDir)../../../../intern\moto\include,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\fmod\include,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\openal,$(SolutionDir)source\gameengine\soundsystem\fmod,$(SolutionDir)source\gameengine\soundsystem\dummy,$(SolutionDir)intern\string,$(SolutionDir)../../../../intern\moto\include,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -111,7 +111,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)lib\windows\fmod\include,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\openal,$(SolutionDir)source\gameengine\soundsystem\fmod,$(SolutionDir)source\gameengine\soundsystem\dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)..\lib\windows\fmod\include,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\openal,$(SolutionDir)source\gameengine\soundsystem\fmod,$(SolutionDir)source\gameengine\soundsystem\dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\blender\include,$(SolutionDir)lib\windows\fmod\include,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\openal,$(SolutionDir)source\gameengine\soundsystem\fmod,$(SolutionDir)source\gameengine\soundsystem\dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)source\blender\include,$(SolutionDir)..\lib\windows\fmod\include,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\openal,$(SolutionDir)source\gameengine\soundsystem\fmod,$(SolutionDir)source\gameengine\soundsystem\dummy,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" RuntimeLibrary="1" DefaultCharIsUnsigned="TRUE" diff --git a/make/msvc_7_0/gameengine/sound/fmod/SND_fmod.vcproj b/make/msvc_7_0/gameengine/sound/fmod/SND_fmod.vcproj index bd04c29fb02..e756b6fc134 100644 --- a/make/msvc_7_0/gameengine/sound/fmod/SND_fmod.vcproj +++ b/make/msvc_7_0/gameengine/sound/fmod/SND_fmod.vcproj @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source/gameengine/soundsystem/intern";"$(SolutionDir)source/gameengine/soundsystem";"$(SolutionDir)intern\moto\include";"$(SolutionDir)lib\windows\fmod\include";"$(SolutionDir)intern\string";"$(SolutionDir)source\kernel\gen_system"" + AdditionalIncludeDirectories=""$(SolutionDir)source\gameengine\soundsystem";"$(SolutionDir)source/gameengine/soundsystem/intern";"$(SolutionDir)source/gameengine/soundsystem";"$(SolutionDir)intern\moto\include";"$(SolutionDir)..\lib\windows\fmod\include";"$(SolutionDir)intern\string";"$(SolutionDir)source\kernel\gen_system"" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)../../../../source/gameengine/soundsystem/intern,$(SolutionDir)../../../../source/gameengine/soundsystem,$(SolutionDir)lib\windows\fmod\include,$(SolutionDir)../../../../../intern\moto\include,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)../../../../source/gameengine/soundsystem/intern,$(SolutionDir)../../../../source/gameengine/soundsystem,$(SolutionDir)..\lib\windows\fmod\include,$(SolutionDir)../../../../../intern\moto\include,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)../../../../source/gameengine/soundsystem/intern,$(SolutionDir)../../../../source/gameengine/soundsystem,$(SolutionDir)../../../../../intern\moto\include,$(SolutionDir)lib\windows\fmod\include,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)../../../../source/gameengine/soundsystem/intern,$(SolutionDir)../../../../source/gameengine/soundsystem,$(SolutionDir)../../../../../intern\moto\include,$(SolutionDir)..\lib\windows\fmod\include,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)../../../../source/gameengine/soundsystem/intern,$(SolutionDir)../../../../source/gameengine/soundsystem,$(SolutionDir)../../../../../intern\moto\include,$(SolutionDir)lib\windows\fmod\include,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)../../../../source/gameengine/soundsystem/intern,$(SolutionDir)../../../../source/gameengine/soundsystem,$(SolutionDir)../../../../../intern\moto\include,$(SolutionDir)..\lib\windows\fmod\include,$(SolutionDir)intern\string,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/make/msvc_7_0/gameengine/sound/openal/SND_openal.vcproj b/make/msvc_7_0/gameengine/sound/openal/SND_openal.vcproj index 40afdff21f7..fd0df93fa64 100644 --- a/make/msvc_7_0/gameengine/sound/openal/SND_openal.vcproj +++ b/make/msvc_7_0/gameengine/sound/openal/SND_openal.vcproj @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem\intern,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem\intern,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\intern,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\intern,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" RuntimeLibrary="1" DefaultCharIsUnsigned="TRUE" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\intern,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\intern,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -157,7 +157,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\intern,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)lib\windows\openal\include,$(SolutionDir)source\kernel\gen_system" + AdditionalIncludeDirectories="$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)source\gameengine\soundsystem\intern,$(SolutionDir)source\gameengine\soundsystem,$(SolutionDir)intern\string,$(SolutionDir)intern\moto\include,$(SolutionDir)..\lib\windows\openal\include,$(SolutionDir)source\kernel\gen_system" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" |