Fix for zlib with MSVC/SCONS. Should compile now. This does not fix the bullet issues...
authorJohnny Matthews <johnny.matthews@gmail.com>
Thu, 28 Jul 2005 18:11:10 +0000 (18:11 +0000)
committerJohnny Matthews <johnny.matthews@gmail.com>
Thu, 28 Jul 2005 18:11:10 +0000 (18:11 +0000)
SConstruct
source/blender/blenkernel/SConscript
source/blender/blenlib/SConscript
source/blender/blenloader/SConscript

index 77834ab..76d35a9 100644 (file)
@@ -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
index 007daf4..a71063f 100644 (file)
@@ -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'])
index 74d5049..f9f7012 100644 (file)
@@ -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)
index 01bee86..fa380bc 100644 (file)
@@ -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'])