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

mistake, someone can please help fix, just trying to get things to compile here
in the studio. You'll need to delete config.opts

diff --git a/SConstruct b/SConstruct
index a00dae683e78469708d5c00a26696268031f8417..311da8c33ecf80348d185ec89b52adaaf4673c66 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -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.'),

diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 9f9c0e90605e7e17996de3a234390f124d464d84..c4146b6450a2f7e33c9c6662ade4b2b1afb1f691 100644 (file)
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -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)