Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Matthews <johnny.matthews@gmail.com>2005-07-28 22:11:10 +0400
committerJohnny Matthews <johnny.matthews@gmail.com>2005-07-28 22:11:10 +0400
commit0f3303b7c502ee6318758803e7288019d32455af (patch)
treef21866fb5d9c779fec2adeaf9c24a75d545cf745 /source/blender
parentb5ec3efeaf4ac7698117393046c72db0273c33f1 (diff)
Fix for zlib with MSVC/SCONS. Should compile now. This does not fix the bullet issues yet. But with this Blender should compile without the gameengine.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/SConscript2
-rw-r--r--source/blender/blenlib/SConscript1
-rw-r--r--source/blender/blenloader/SConscript1
3 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 007daf445d3..a71063f8038 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -69,4 +69,4 @@ blenkernel_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_
SConscript(['bad_level_call_stubs/SConscript'])
blenkernel_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
-
+blenkernel_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index 74d5049edbf..f9f7012c17c 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -38,4 +38,5 @@ if user_options_dict['USE_INTERNATIONAL'] == 1:
blenlib_env.Append (CPPPATH = extra_includes)
blenlib_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE'])
+blenlib_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
blenlib_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenlib', source=source_files)
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index 01bee86b51b..fa380bc791b 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -24,3 +24,4 @@ blenloader_env.Append (CPPPATH = ['.',
'../readstreamglue'])
blenloader_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenloader', source=source_files)
+blenloader_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])