sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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.

Browse Source
This commit is contained in:
Johnny Matthews 2005-07-28 18:11:10 +00:00
parent b5ec3efeaf
commit 0f3303b7c5
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -373,7 +373,7 @@ elif sys.platform == 'win32':
if use_quicktime == 'true': if use_quicktime == 'true':
extra_includes += ['#../lib/windows/QTDevWin/CIncludes'] extra_includes += ['#../lib/windows/QTDevWin/CIncludes']
# z library information # z library information
z_lib = ['libz_st'] z_lib = ['libz']
z_libpath = ['#../lib/windows/zlib/lib'] z_libpath = ['#../lib/windows/zlib/lib']
z_include = ['#../lib/windows/zlib/include'] z_include = ['#../lib/windows/zlib/include']
# png library information # png library information

2
source/blender/blenkernel/SConscript
View File

@ -69,4 +69,4 @@ blenkernel_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_
SConscript(['bad_level_call_stubs/SConscript']) SConscript(['bad_level_call_stubs/SConscript'])
blenkernel_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) blenkernel_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
blenkernel_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])

1
source/blender/blenlib/SConscript
View File

@ -38,4 +38,5 @@ if user_options_dict['USE_INTERNATIONAL'] == 1:
blenlib_env.Append (CPPPATH = extra_includes) blenlib_env.Append (CPPPATH = extra_includes)
blenlib_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE']) 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) blenlib_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenlib', source=source_files)

1
source/blender/blenloader/SConscript
View File

@ -24,3 +24,4 @@ blenloader_env.Append (CPPPATH = ['.',
'../readstreamglue']) '../readstreamglue'])
blenloader_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenloader', source=source_files) blenloader_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenloader', source=source_files)
blenloader_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])