forked from bartvdbraak/blender
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.
This commit is contained in:
parent
b5ec3efeaf
commit
0f3303b7c5
@ -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
|
||||
|
@ -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'])
|
||||
|
@ -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)
|
||||
|
@ -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'])
|
||||
|
Loading…
Reference in New Issue
Block a user