griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
275093324feab04bf31f9fb031e594da94de8149
test/source/blender/imbuf/SConscript

59 lines
1.5 KiB
Python
Raw Normal View History

Added #!/usr/bin/python standard script identifier to the start of SConscript files. Makes text editors identify SConscripts as Python, and syntax highlight properly.
2004-05-16 13:07:20 +00:00
#!/usr/bin/python
attempt to fix windows/scons issue I caused in a recent commit.
2011-09-19 15:18:58 +00:00
import os
== SCons == * This commit is all of the rewrite work done on the SCons system. For documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt. Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring contains valuable information, along with what still needs to be done. - linux, os x and windows compile now. - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py) - NOTE: Jean-Luc P will commit sometime during the weekend proper appit() for OS X. For now, copy the resulting binary to an existing .app bundle. - features: - cleaner structure for better maintenance - cleaner output during compile - better handling of build options - general overall speed increase - see the wiki for more info Cygwin, FreeBSD and Solaris systems still need work. For these systems: 1) copy a config/(platform)-config.py to ie. config/cygwin-config.py 2) set the proper defaults for your platform 3) mail me at jesterking at letwory dot net with you configuration. if you need any modifications to the system, do send a patch, too. I'll be giving first-aid today and tomorrow, after that it'll be all regular development work :) /Nathan
2006-02-04 14:15:10 +00:00
Import ('env')
SCons updates * Blender static now links. By default this option is disabled on all platforms. Simply set the option in config.opts to 'true'. * Added the following flags to config.opts: - HOST_CC. This is the C compiler for the host platform. This value is the same as TARGET_CC when not cross compiling. - HOST_CXX. This is the C++ compiler for the host platform. This value is the same as TARGET_CXX when not cross compiling. - TARGET_CC. This is the C compiler for the target platform. - TARGET_CXX. This is the C++ compiler for the target platform. - TARGET_AR. This is the linker command for linking libraries. - PATH This is the standard search path All SConscript files have been updated to reflect these changes. Now it's possible to change only the root SConstruct file, and all compiler specific variables are passed automatically to all SConscript files. Of course, this does not apply to makesdna because there the host and target platform is different from all other libraries. To pass a variable that applies to all platforms, all we now have to do is set the correct value in library_env Note: as usual, to get the latest options in the config.opts file, first remove your version.
2004-02-29 21:40:48 +00:00
== SCons == * This commit is all of the rewrite work done on the SCons system. For documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt. Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring contains valuable information, along with what still needs to be done. - linux, os x and windows compile now. - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py) - NOTE: Jean-Luc P will commit sometime during the weekend proper appit() for OS X. For now, copy the resulting binary to an existing .app bundle. - features: - cleaner structure for better maintenance - cleaner output during compile - better handling of build options - general overall speed increase - see the wiki for more info Cygwin, FreeBSD and Solaris systems still need work. For these systems: 1) copy a config/(platform)-config.py to ie. config/cygwin-config.py 2) set the proper defaults for your platform 3) mail me at jesterking at letwory dot net with you configuration. if you need any modifications to the system, do send a patch, too. I'll be giving first-aid today and tomorrow, after that it'll be all regular development work :) /Nathan
2006-02-04 14:15:10 +00:00
sources = env.Glob('intern/*.c')
SCons build system files added. You'll need SCons (www.scons.org) to build. Platforms currently working: * Linux (me) - options for quicktime, openal and international disabled - uses the system libs and include files for building - no option to build with the precompiled libraries yet. * Windows (jesterKing) - builds with quicktime (optional) - builds with openal (optional) - builds with international support (optional) - Use the DOS box to build - builds with precompiled libraries * Irix (Hos) - Uses default Irix compiler - Not all optimization levels correct yet - options for quicktime, openal and international disabled - builds with precompiled libraries * Cygwin (me) - has a problem in the linking stage - uses free build tools (gcc) - options for quicktime, openal and international disabled - uses the system libs and include files for building - no option to build with the precompiled libraries yet. * MacOS (sgefant) - builds with quicktime (optional) - options for openal and international disabled - builds a nice bundle - builds with precompiled libraries Thanks to IanWill for a bugfix in the Linux build. Note: This is a work in progress. A lot still has to be done - for example the optional parts are only to be enabled by directly setting 'true' or 'false' in the SConstruct file. This needs to be moved to a user config file. Also, the .o/.obj files are stored in the source tree. This needs to be fixed as well. The game engine is not yet built.
2004-01-04 21:11:59 +00:00
* Add memcache limitor-support to imbufs * Add ffmpeg-read support in anim.c and util.c * Makes ImBufs refcountable. You can now increase an internal refcounter in ImBufs (using IMB_refImBuf) which is decreased by freeImBuf. This makes it possible to simply pass ImBuf pointers around in the sequencer saving a few memcopies.
2006-02-05 19:23:34 +00:00
incs = '. ../makesdna #/intern/guardedalloc #/intern/memutil ../blenlib'
I swear, it was just an innocence change in guardedalloc! The butterfly wing flap, causing a nice storm in the rest of blender. Now all dependencies should point ok again. CMakers, do double-test.
2011-02-21 12:35:04 +00:00
incs += ' ../avi ../blenkernel ../blenloader'
== FFMPEG == Added central compatibility header file, which enables blender to compile against very old ffmpeg versions as well as very new versions using the *NEW* API. (Old API functions are simulated using macros and inline functions) Added a whole lot of additional checks, tested against 6 different versions down the timeline, hopefully, now finally all is well.
2011-05-27 23:33:40 +00:00
incs += ' #/intern/ffmpeg'
Mac / COCOA : Imbuf - replace libtiff by calls to Cocoa services to load/save tiff files (Libtiff, dynamically linked is not distributed with OS X, and would have had to be shipped for all four architectures) The imb_cocoaLoadImage & imb_cocoaSaveImage are generic towards the bitmap format, and thus can handle TIFF, GIF, JPG, JP2000, BMP and raw camera formats (read-only for these), even if today only TIFF is used as the other formats are already handled. - CMake updated - scons updated (Thx to Jens Verwiebe)
2009-10-29 18:06:49 +00:00
== SCons == * This commit is all of the rewrite work done on the SCons system. For documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt. Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring contains valuable information, along with what still needs to be done. - linux, os x and windows compile now. - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py) - NOTE: Jean-Luc P will commit sometime during the weekend proper appit() for OS X. For now, copy the resulting binary to an existing .app bundle. - features: - cleaner structure for better maintenance - cleaner output during compile - better handling of build options - general overall speed increase - see the wiki for more info Cygwin, FreeBSD and Solaris systems still need work. For these systems: 1) copy a config/(platform)-config.py to ie. config/cygwin-config.py 2) set the proper defaults for your platform 3) mail me at jesterking at letwory dot net with you configuration. if you need any modifications to the system, do send a patch, too. I'll be giving first-aid today and tomorrow, after that it'll be all regular development work :) /Nathan
2006-02-04 14:15:10 +00:00
incs += ' ' + env['BF_JPEG_INC']
incs += ' ' + env['BF_PNG_INC']
incs += ' ' + env['BF_TIFF_INC']
incs += ' ' + env['BF_ZLIB_INC']
SCons build system files added. You'll need SCons (www.scons.org) to build. Platforms currently working: * Linux (me) - options for quicktime, openal and international disabled - uses the system libs and include files for building - no option to build with the precompiled libraries yet. * Windows (jesterKing) - builds with quicktime (optional) - builds with openal (optional) - builds with international support (optional) - Use the DOS box to build - builds with precompiled libraries * Irix (Hos) - Uses default Irix compiler - Not all optimization levels correct yet - options for quicktime, openal and international disabled - builds with precompiled libraries * Cygwin (me) - has a problem in the linking stage - uses free build tools (gcc) - options for quicktime, openal and international disabled - uses the system libs and include files for building - no option to build with the precompiled libraries yet. * MacOS (sgefant) - builds with quicktime (optional) - options for openal and international disabled - builds a nice bundle - builds with precompiled libraries Thanks to IanWill for a bugfix in the Linux build. Note: This is a work in progress. A lot still has to be done - for example the optional parts are only to be enabled by directly setting 'true' or 'false' in the SConstruct file. This needs to be moved to a user config file. Also, the .o/.obj files are stored in the source tree. This needs to be fixed as well. The game engine is not yet built.
2004-01-04 21:11:59 +00:00
== SCons == * This commit is all of the rewrite work done on the SCons system. For documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt. Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring contains valuable information, along with what still needs to be done. - linux, os x and windows compile now. - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py) - NOTE: Jean-Luc P will commit sometime during the weekend proper appit() for OS X. For now, copy the resulting binary to an existing .app bundle. - features: - cleaner structure for better maintenance - cleaner output during compile - better handling of build options - general overall speed increase - see the wiki for more info Cygwin, FreeBSD and Solaris systems still need work. For these systems: 1) copy a config/(platform)-config.py to ie. config/cygwin-config.py 2) set the proper defaults for your platform 3) mail me at jesterking at letwory dot net with you configuration. if you need any modifications to the system, do send a patch, too. I'll be giving first-aid today and tomorrow, after that it'll be all regular development work :) /Nathan
2006-02-04 14:15:10 +00:00
defs = []
SCons build system files added. You'll need SCons (www.scons.org) to build. Platforms currently working: * Linux (me) - options for quicktime, openal and international disabled - uses the system libs and include files for building - no option to build with the precompiled libraries yet. * Windows (jesterKing) - builds with quicktime (optional) - builds with openal (optional) - builds with international support (optional) - Use the DOS box to build - builds with precompiled libraries * Irix (Hos) - Uses default Irix compiler - Not all optimization levels correct yet - options for quicktime, openal and international disabled - builds with precompiled libraries * Cygwin (me) - has a problem in the linking stage - uses free build tools (gcc) - options for quicktime, openal and international disabled - uses the system libs and include files for building - no option to build with the precompiled libraries yet. * MacOS (sgefant) - builds with quicktime (optional) - options for openal and international disabled - builds a nice bundle - builds with precompiled libraries Thanks to IanWill for a bugfix in the Linux build. Note: This is a work in progress. A lot still has to be done - for example the optional parts are only to be enabled by directly setting 'true' or 'false' in the SConstruct file. This needs to be moved to a user config file. Also, the .o/.obj files are stored in the source tree. This needs to be fixed as well. The game engine is not yet built.
2004-01-04 21:11:59 +00:00
Merge image related changes from the render branch. This includes the image tile cache code in imbuf, but it is not hooked up to the render engine. Imbuf module: some small refactoring and removing a lot of unused or old code (about 6.5k lines). * Added a ImFileType struct with callbacks to make adding an file format type, or making changes to the API easier. * Move imbuf init/exit code into IMB_init()/IMB_exit() functions. * Increased mipmap levels from 10 to 20, you run into this limit already with a 2k image. * Removed hamx, amiga, anim5 format support. * Removed colormap saving, only simple colormap code now for reading tga. * Removed gen_dynlibtiff.py, editing this is almost as much work as just editing the code directly. * Functions removed that were only used for sequencer plugin API: IMB_anim_nextpic, IMB_clever_double, IMB_antialias, IMB_gamwarp, IMB_scalefieldImBuf, IMB_scalefastfieldImBuf, IMB_onethird, IMB_halflace, IMB_dit0, IMB_dit2, IMB_cspace * Write metadata info into OpenEXR images. Can be viewed with the command line utility 'exrheader' For the image tile cache code, see this page: http://wiki.blender.org/index.php/Dev:2.5/Source/Imaging/ImageTileCache
2010-05-07 15:18:04 +00:00
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
* Minor cleanup of SCons files - cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1 - changed SConscripts accordingly
2008-10-22 11:28:10 +00:00
if env['WITH_BF_OPENEXR']:
== SCons == * This commit is all of the rewrite work done on the SCons system. For documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt. Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring contains valuable information, along with what still needs to be done. - linux, os x and windows compile now. - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py) - NOTE: Jean-Luc P will commit sometime during the weekend proper appit() for OS X. For now, copy the resulting binary to an existing .app bundle. - features: - cleaner structure for better maintenance - cleaner output during compile - better handling of build options - general overall speed increase - see the wiki for more info Cygwin, FreeBSD and Solaris systems still need work. For these systems: 1) copy a config/(platform)-config.py to ie. config/cygwin-config.py 2) set the proper defaults for your platform 3) mail me at jesterking at letwory dot net with you configuration. if you need any modifications to the system, do send a patch, too. I'll be giving first-aid today and tomorrow, after that it'll be all regular development work :) /Nathan
2006-02-04 14:15:10 +00:00
defs.append('WITH_OPENEXR')
Blender TIFF support * Removed dynamic linking libTIFF code and change it to static linking (built into the blender executable). Dynamic linking made things a fair bit more complicated and wasn't working at all before on OS X - the dylib didn't exist and wasn't being copied. Since TIFF is more heavily depended upon now in Blender, it makes sense to make it less 'optional' and more in line with other libraries. I've updated both CMake and scons, and CMake on OS X/64bit works fine. It's now up to other platform/build system maintainers to enable this for their respective platforms (Campbell will check it for linux). For windows, and non-64bit osx, we need static libtiff libraries in /lib. I've added options WITH_TIFF for CMake and WITH_BF_TIFF for scons, so if blender won't build because of this, you should be able to disable these options until your build system has been updated. * Bonus feature: while doing this, I added support for loading 16bit and 32bit per channel TIFFs - they get converted to Blender's float buffers. Handy for zbrush displacement maps!
2010-05-21 03:25:38 +00:00
if env['WITH_BF_TIFF']:
defs.append('WITH_TIFF')
remove WITH_* defines from image formats, instead just dont build the files at all.
2011-09-19 06:32:19 +00:00
else:
attempt to fix windows/scons issue I caused in a recent commit.
2011-09-19 15:18:58 +00:00
sources.remove(os.path.join('intern', 'tiff.c'))
Blender TIFF support * Removed dynamic linking libTIFF code and change it to static linking (built into the blender executable). Dynamic linking made things a fair bit more complicated and wasn't working at all before on OS X - the dylib didn't exist and wasn't being copied. Since TIFF is more heavily depended upon now in Blender, it makes sense to make it less 'optional' and more in line with other libraries. I've updated both CMake and scons, and CMake on OS X/64bit works fine. It's now up to other platform/build system maintainers to enable this for their respective platforms (Campbell will check it for linux). For windows, and non-64bit osx, we need static libtiff libraries in /lib. I've added options WITH_TIFF for CMake and WITH_BF_TIFF for scons, so if blender won't build because of this, you should be able to disable these options until your build system has been updated. * Bonus feature: while doing this, I added support for loading 16bit and 32bit per channel TIFFs - they get converted to Blender's float buffers. Handy for zbrush displacement maps!
2010-05-21 03:25:38 +00:00
* Minor cleanup of SCons files - cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1 - changed SConscripts accordingly
2008-10-22 11:28:10 +00:00
if env['WITH_BF_DDS']:
This commit is a modified version of patch #6860 It adds read only dds support. (Writing will come later) Kent
2007-06-25 19:50:25 +00:00
defs.append('WITH_DDS')
build options to disable image formats WITH_CINEON, WITH_HDR. - updated cmake, make & scons. - renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
2010-08-03 11:25:34 +00:00
if env['WITH_BF_CINEON']:
defs.append('WITH_CINEON')
if env['WITH_BF_HDR']:
defs.append('WITH_HDR')
remove WITH_* defines from image formats, instead just dont build the files at all.
2011-09-19 06:32:19 +00:00
else:
attempt to fix windows/scons issue I caused in a recent commit.
2011-09-19 15:18:58 +00:00
sources.remove(os.path.join('intern', 'radiance_hdr.c'))
build options to disable image formats WITH_CINEON, WITH_HDR. - updated cmake, make & scons. - renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
2010-08-03 11:25:34 +00:00
* Minor cleanup of SCons files - cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1 - changed SConscripts accordingly
2008-10-22 11:28:10 +00:00
if env['WITH_BF_FFMPEG']:
typo
2006-02-06 00:50:21 +00:00
defs.append('WITH_FFMPEG')
[ #4035 ] patch to make scons compile with ffmpeg in mingw Submitted by Joseph Eagar (joeedh). windows/gcc ffmpeg library may need recompiling to support all codecs necessary (ie. H264 doesn't work).
2006-08-14 12:47:13 +00:00
incs += ' ' + env['BF_FFMPEG_INC']
* Add memcache limitor-support to imbufs * Add ffmpeg-read support in anim.c and util.c * Makes ImBufs refcountable. You can now increase an internal refcounter in ImBufs (using IMB_refImBuf) which is decreased by freeImBuf. This makes it possible to simply pass ImBuf pointers around in the sequencer saving a few memcopies.
2006-02-05 19:23:34 +00:00
* Minor cleanup of SCons files - cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1 - changed SConscripts accordingly
2008-10-22 11:28:10 +00:00
if env['WITH_BF_OPENJPEG']:
== RED one (redcode) == This adds redcode (the file format of RED one, R3D) support to blender. Seems to work fine with the footage I found on the web, but keep in mind, that because of the unoptimized nature of libopenjpeg, frame decoding isn't that fast. It is also a rather challenging task, to make 4k-float-footage realtime :)
2008-06-02 21:35:57 +00:00
defs.append('WITH_OPENJPEG')
incs += ' ' + env['BF_OPENJPEG_INC']
remove WITH_* defines from image formats, instead just dont build the files at all.
2011-09-19 06:32:19 +00:00
else:
attempt to fix windows/scons issue I caused in a recent commit.
2011-09-19 15:18:58 +00:00
sources.remove(os.path.join('intern', 'jp2.c'))
== RED one (redcode) == This adds redcode (the file format of RED one, R3D) support to blender. Seems to work fine with the footage I found on the web, but keep in mind, that because of the unoptimized nature of libopenjpeg, frame decoding isn't that fast. It is also a rather challenging task, to make 4k-float-footage realtime :)
2008-06-02 21:35:57 +00:00
* Minor cleanup of SCons files - cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1 - changed SConscripts accordingly
2008-10-22 11:28:10 +00:00
if env['WITH_BF_REDCODE']:
== RED one (redcode) == This adds redcode (the file format of RED one, R3D) support to blender. Seems to work fine with the footage I found on the web, but keep in mind, that because of the unoptimized nature of libopenjpeg, frame decoding isn't that fast. It is also a rather challenging task, to make 4k-float-footage realtime :)
2008-06-02 21:35:57 +00:00
defs.append('WITH_REDCODE')
incs += ' ' + env['BF_REDCODE_INC']
* Minor cleanup of SCons files - cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1 - changed SConscripts accordingly
2008-10-22 11:28:10 +00:00
if env['WITH_BF_QUICKTIME']:
Finally change SConscript tabs to spaces.
2010-08-29 20:52:05 +00:00
incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
defs.append('WITH_QUICKTIME')
== SCons == * This commit is all of the rewrite work done on the SCons system. For documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt. Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring contains valuable information, along with what still needs to be done. - linux, os x and windows compile now. - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py) - NOTE: Jean-Luc P will commit sometime during the weekend proper appit() for OS X. For now, copy the resulting binary to an existing .app bundle. - features: - cleaner structure for better maintenance - cleaner output during compile - better handling of build options - general overall speed increase - see the wiki for more info Cygwin, FreeBSD and Solaris systems still need work. For these systems: 1) copy a config/(platform)-config.py to ie. config/cygwin-config.py 2) set the proper defaults for your platform 3) mail me at jesterking at letwory dot net with you configuration. if you need any modifications to the system, do send a patch, too. I'll be giving first-aid today and tomorrow, after that it'll be all regular development work :) /Nathan
2006-02-04 14:15:10 +00:00
== SCons == * bring back 'player' libtype, after investigation with ideasman. scons/mingw works nicely, for some reason msvc fails to link still, will look further into it.
2009-09-05 01:58:02 +00:00
env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [185,115] )
Reference in New Issue Copy Permalink