diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/blenloader/SConscript | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 77834ab195b..76d35a9c9cc 100644 --- a/SConstruct +++ b/SConstruct @@ -373,7 +373,7 @@ elif sys.platform == 'win32': if use_quicktime == 'true': extra_includes += ['#../lib/windows/QTDevWin/CIncludes'] # z library information - z_lib = ['libz_st'] + z_lib = ['libz'] z_libpath = ['#../lib/windows/zlib/lib'] z_include = ['#../lib/windows/zlib/include'] # png library information 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']) |