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

* Attempting to fix scons for mac os x. It seems to be correct, if I've made a

Browse Source 
mistake, someone can please help fix, just trying to get things to compile here
in the studio. You'll need to delete config.opts
This commit is contained in:
Matt Ebb 2005-11-23 13:44:58 +00:00
parent 1b6482771e
commit 6d8a7d7819
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SConstruct
View File

@ -198,6 +198,10 @@ elif sys.platform == 'darwin':
jpeg_lib = ['libjpeg']
jpeg_libpath = [darwin_precomp + 'jpeg/lib']
jpeg_include = [darwin_precomp + 'jpeg/include']
# TIFF library information
tiff_lib = ['libtiff']
tiff_libpath = [darwin_precomp + 'tiff/lib']
tiff_include = [darwin_precomp + 'tiff/include']
# OpenGL library information
opengl_lib = ['GL', 'GLU']
opengl_static = []
@ -887,6 +891,9 @@ else:
config.write ("JPEG_INCLUDE = %r\n"%(jpeg_include))
config.write ("JPEG_LIBPATH = %r\n"%(jpeg_libpath))
config.write ("JPEG_LIBRARY = %r\n"%(jpeg_lib))
config.write ("TIFF_INCLUDE = %r\n"%(tiff_include))
config.write ("TIFF_LIBPATH = %r\n"%(tiff_libpath))
config.write ("TIFF_LIBRARY = %r\n"%(tiff_lib))
config.write ("OPENGL_INCLUDE = %r\n"%(opengl_include))
config.write ("OPENGL_LIBPATH = %r\n"%(opengl_libpath))
config.write ("OPENGL_LIBRARY = %r\n"%(opengl_lib))
@ -996,6 +1003,9 @@ user_options.AddOptions (
('JPEG_INCLUDE', 'Include directory for jpeg header files.'),
('JPEG_LIBPATH', 'Library path where the jpeg library is located.'),
('JPEG_LIBRARY', 'jpeg library name.'),
('TIFF_INCLUDE', 'Include directory for TIFF header files.'),
('TIFF_LIBPATH', 'Library path where the TIFF library is located.'),
('TIFF_LIBRARY', 'TIFF library name.'),
('OPENGL_INCLUDE', 'Include directory for OpenGL header files.'),
('OPENGL_LIBPATH', 'Library path where the OpenGL libraries are located.'),
('OPENGL_LIBRARY', 'OpenGL library names.'),

1
source/blender/imbuf/SConscript
View File

@ -47,6 +47,7 @@ imbuf_env.Append (CPPPATH = ['.',
imbuf_env.Append (CPPPATH = user_options_dict['JPEG_INCLUDE'])
imbuf_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE'])
imbuf_env.Append (CPPPATH = user_options_dict['TIFF_INCLUDE'])
imbuf_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
imbuf_env.Append (CPPPATH = extra_includes)
imbuf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_imbuf', source=source_files)