sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
94fa7060a8
blender/build_files/scons/config/win32-vc-config.py

213 lines
6.5 KiB
Python
Raw Normal View History

== 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
LCGDIR = '#../lib/windows'
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
LIBDIR = '${LCGDIR}'
Scons: * Some code and comment cleanup * Remove cmake equivalent variable comments * Remove some non used parameters from config files and btools: WITH_BF_FMOD, BF_VERSION. * Remove some commented non-used variables
2012-04-07 18:26:54 +00:00
WITH_BF_FFMPEG = True
Patch [ #5254 ] FFMpeg for scons for MSVC from Guillaume Lecocq I also added -D_CRT_SECURE_NO_DEPRECATE to shut the newer msvc version about deprecated functions (sprintf et al).
2006-11-20 11:15:35 +00:00
BF_FFMPEG = LIBDIR +'/ffmpeg'
* changes to work with updated FFMPEG libs. Mainly build system. CMake files may need changing too. NOTE: remember to svn up in lib/windows!
2009-08-24 02:49:57 +00:00
BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
Patch [ #5254 ] FFMpeg for scons for MSVC from Guillaume Lecocq I also added -D_CRT_SECURE_NO_DEPRECATE to shut the newer msvc version about deprecated functions (sprintf et al).
2006-11-20 11:15:35 +00:00
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
FFmpeg library update: - Update scons/cmake rules to use new versions of libs/dlls. - Update rules for buildbot.
2011-08-22 18:49:42 +00:00
BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
Patch [ #5254 ] FFMpeg for scons for MSVC from Guillaume Lecocq I also added -D_CRT_SECURE_NO_DEPRECATE to shut the newer msvc version about deprecated functions (sprintf et al).
2006-11-20 11:15:35 +00:00
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_PYTHON = LIBDIR + '/python'
Move Windows SCons system to build Blender against the new Python 3.2 libs committed in r35340 and r35341. Platform maintainers and release builders, please update your systems also to Python 3.2.
2011-03-04 00:59:45 +00:00
BF_PYTHON_VERSION = '3.2'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
== 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
BF_PYTHON_BINARY = 'python'
Move Windows SCons system to build Blender against the new Python 3.2 libs committed in r35340 and r35341. Platform maintainers and release builders, please update your systems also to Python 3.2.
2011-03-04 00:59:45 +00:00
BF_PYTHON_LIB = 'python32'
* fixes for compiling with scons/mingw when BF_DEBUG=1. Needs svn up in lib/windows, where I added necessary mingw libs.
2009-09-23 12:10:56 +00:00
BF_PYTHON_DLL = '${BF_PYTHON_LIB}'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
== 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 === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_OPENAL = True
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_OPENAL = LIBDIR + '/openal'
2.5: Sound branch merge! See mailing list for additional information.
2009-08-09 21:16:39 +00:00
BF_OPENAL_INC = '${BF_OPENAL}/include '
Reverting changes made to build systems when was upgrading OpenAL. Reverting to openal from creative because own builds doesn't deal with 3D sound. Hopefully it wouldn't lead to crashes caused by ffmpeg+openal (for resolving which libraries were updated to openal-soft).
2012-02-17 16:58:34 +00:00
BF_OPENAL_LIB = 'wrap_oal'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
* merge main SConstruct and some of the utility scripts for our scons build from trunk. Note: I'll be working on improving our scons build environment in this branch Note2: I'll be upgrading our scripts to work fully with scons 1.0 (and possibly later)
2008-10-05 21:33:23 +00:00
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_ICONV = True
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_ICONV = LIBDIR + '/iconv'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_ICONV_INC = '${BF_ICONV}/include'
== 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
BF_ICONV_LIB = 'iconv'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
2.5: Sound branch merge! See mailing list for additional information.
2009-08-09 21:16:39 +00:00
* Jack support should be off by default until things have been cleared up (see meeting notes 16.8.2009)
2009-08-17 09:20:14 +00:00
WITH_BF_JACK = False
== SCons == * add jack support for audio system. Note that for OSX jack support is still off by default, since I'm not sure about what goes where. OSX maintainers, please check and fix.
2009-08-17 01:16:50 +00:00
BF_JACK = LIBDIR + '/jack'
fix from nico_ga on IRC, building on MSVC with jack but not ffmpeg.
2011-06-06 08:40:47 +00:00
BF_JACK_INC = '${BF_JACK}/include ${BF_FFMPEG}/include/msvc'
== SCons == * add jack support for audio system. Note that for OSX jack support is still off by default, since I'm not sure about what goes where. OSX maintainers, please check and fix.
2009-08-17 01:16:50 +00:00
BF_JACK_LIB = 'libjack'
BF_JACK_LIBPATH = '${BF_JACK}/lib'
Enable libsndfile by default on win32 too.
2011-08-30 12:40:15 +00:00
WITH_BF_SNDFILE = True
== SCons == * Add sndfile support (False by default). Note: for this to work, make sure that FFMPEG-support is disabled.
2009-08-25 10:56:01 +00:00
BF_SNDFILE = LIBDIR + '/sndfile'
BF_SNDFILE_INC = '${BF_SNDFILE}/include'
BF_SNDFILE_LIB = 'libsndfile-1'
BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_SDL = True
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_SDL = LIBDIR + '/sdl'
==SCons== * cleaning cruft away
2006-02-05 17:58:08 +00:00
BF_SDL_INC = '${BF_SDL}/include'
BF_SDL_LIB = 'SDL.lib'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_SDL_LIBPATH = '${BF_SDL}/lib'
== 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
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_PTHREADS = LIBDIR + '/pthreads'
==SCons== + SCons support for pthreads-win32. Library will be committed shortly into lib/windows, so be sure to check commit list and update that as well when the pthread lib is available.
2006-02-25 14:53:27 +00:00
BF_PTHREADS_INC = '${BF_PTHREADS}/include'
BF_PTHREADS_LIB = 'pthreadVC2'
BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_OPENEXR = True
WITH_BF_STATICOPENEXR = False
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_OPENEXR = LIBDIR + '/openexr'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
Corrected IThread.lib to IlmThread.lib.. thanks Stephane :)
2007-01-01 12:01:41 +00:00
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
Openexr path change for scons (win)
2011-12-31 17:15:47 +00:00
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
* merge main SConstruct and some of the utility scripts for our scons build from trunk. Note: I'll be working on improving our scons build environment in this branch Note2: I'll be upgrading our scripts to work fully with scons 1.0 (and possibly later)
2008-10-05 21:33:23 +00:00
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
== 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 === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_DDS = True
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
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_JPEG = True
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_JPEG = LIBDIR + '/jpeg'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_JPEG_INC = '${BF_JPEG}/include'
== 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
BF_JPEG_LIB = 'libjpeg'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
== 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 === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_PNG = True
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_PNG = LIBDIR + '/png'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_PNG_INC = '${BF_PNG}/include'
* Changes for static win32 png libs.
2011-12-19 19:46:07 +00:00
BF_PNG_LIB = 'libpng'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_PNG_LIBPATH = '${BF_PNG}/lib'
== 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
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
WITH_BF_TIFF = True
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_TIFF = LIBDIR + '/tiff'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_TIFF_INC = '${BF_TIFF}/include'
2.5: merge with trunk, previous merge was only up to yesterday. svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
2008-11-12 22:03:11 +00:00
BF_TIFF_LIB = 'libtiff'
BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
== 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 === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_ZLIB = True
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_ZLIB = LIBDIR + '/zlib'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_ZLIB_INC = '${BF_ZLIB}/include'
== 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
BF_ZLIB_LIB = 'libz'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
== 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 === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_INTERNATIONAL = True
* reflect WITH_BF_INTERNATIONAL changes into (platform)-config.py files too
2006-02-05 12:27:49 +00:00
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_GETTEXT = LIBDIR + '/gettext'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
== 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
BF_GETTEXT_LIB = 'gnu_gettext'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
== 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 === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_GAMEENGINE = True
Set Player building to True by default.
2011-06-20 20:51:12 +00:00
WITH_BF_PLAYER = True
Scons_buildsystem: add WITH_BF_OCEANSIM = True to all configs
2011-11-13 15:10:54 +00:00
WITH_BF_OCEANSIM = True
== 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 === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_BULLET = True
==SCons== Enable Bullet2 for Scons. This should work for all platforms, but please, test, test, test, test, test (ad infinitum)
2006-11-21 06:11:41 +00:00
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
== 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
BF_BULLET_LIB = 'extern_bullet'
==== scons ==== - cleanup for wintab library headers - properly define BF_WINTAB and BF_WINTAB_INC
2006-11-13 06:40:08 +00:00
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_BINRELOC = False
* merge main SConstruct and some of the utility scripts for our scons build from trunk. Note: I'll be working on improving our scons build environment in this branch Note2: I'll be upgrading our scripts to work fully with scons 1.0 (and possibly later)
2008-10-05 21:33:23 +00:00
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
BF_WITH_FREETYPE = True
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_FREETYPE = LIBDIR + '/freetype'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
== 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
BF_FREETYPE_LIB = 'freetype2ST'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
== 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: * Some code and comment cleanup * Remove cmake equivalent variable comments * Remove some non used parameters from config files and btools: WITH_BF_FMOD, BF_VERSION. * Remove some commented non-used variables
2012-04-07 18:26:54 +00:00
WITH_BF_QUICKTIME = False
* Patch #4909 by Joseph Eagar (joeedh) - this patch adds verse support for SCons, which can be enabled by giving WITH_BF_VERSE=1, ie. on command-line - this patch also adds a custom lib dir possibility. From the patch description: "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py." * Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
BF_QUICKTIME = LIBDIR + '/QTDevWin'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
== 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
BF_QUICKTIME_LIB = 'qtmlClient'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
== 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 === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_OPENJPEG = True
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD
2009-01-26 08:34:40 +00:00
BF_OPENJPEG = '#extern/libopenjpeg'
BF_OPENJPEG_LIB = ''
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
* for win64 fftw3 support is already enabled by default, doing so also for win32.
2010-07-28 17:08:24 +00:00
WITH_BF_FFTW3 = True
Smoke: * WITH_BF_FFTW3 flag --> fftw3 scons + cmake settings refined. * Disabled by default since mac + win32 libs missing. Works already on win64 + linux (with installed fftw3 libs)
2009-08-09 10:55:25 +00:00
BF_FFTW3 = LIBDIR + '/fftw3'
BF_FFTW3_INC = '${BF_FFTW3}/include'
BF_FFTW3_LIB = 'libfftw'
BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_REDCODE = False
BF_REDCODE_INC = '#extern'
* update CMake and SCons for the OpenCollada update (to r746). - DocumentExporter changed due to function name change in API - no more UTF lib - enabled by default for win32 Note: debug libs will be added later, as well as 64bit windows libs. For other platforms, get r746 of OpenCollada and build against that.
2010-06-06 00:33:59 +00:00
WITH_BF_COLLADA = True
Merge of the COLLADA GSoC branch into trunk. COLLADA code is disabled by default (it has dependencies requiring manual install). SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch. The detailed command log of the merge (can be useful for educational purposes): branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook # collada code svn copy $branch/source/blender/collada source/blender/collada # operator svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c # menu svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py # scons svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript # cmake svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
BF_COLLADA = '#source/blender/collada'
BF_COLLADA_INC = '${BF_COLLADA}'
BF_COLLADA_LIB = 'bf_collada'
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
Commit to cope with API changes in OpenCOLLADA (latest for Windows right now r827).
2011-01-27 19:39:06 +00:00
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
Merge of the COLLADA GSoC branch into trunk. COLLADA code is disabled by default (it has dependencies requiring manual install). SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch. The detailed command log of the merge (can be useful for educational purposes): branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook # collada code svn copy $branch/source/blender/collada source/blender/collada # operator svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c # menu svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py # scons svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript # cmake svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
3D Mouse support on for windows/msvc by default.
2011-08-02 09:06:55 +00:00
WITH_BF_3DMOUSE = True
Make sure that default settings have OpenMP support by default (also good for buildbots). Note that builders that don't have VS pro version need to manually disable this setting in their respective user-config.py
2011-10-02 17:53:52 +00:00
WITH_BF_OPENMP = True
Add compiles support for Cycles. No CUDA compiling yet, will be added later.
2011-11-08 20:40:02 +00:00
#Cycles
WITH_BF_CYCLES = True
Scons: * Basic support for OpenImageIO and Boost libraries * Path to libraries added for win32/64-vc-config.py, still commented out.
2011-11-03 12:40:15 +00:00
WITH_BF_OIIO = True
Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init. Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).
2011-11-09 17:22:55 +00:00
BF_OIIO = '${LIBDIR}/openimageio'
BF_OIIO_INC = '${BF_OIIO}/include'
Scons: * Basic support for OpenImageIO and Boost libraries * Path to libraries added for win32/64-vc-config.py, still commented out.
2011-11-03 12:40:15 +00:00
BF_OIIO_LIB = 'OpenImageIO'
Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init. Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).
2011-11-09 17:22:55 +00:00
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
Scons: * Basic support for OpenImageIO and Boost libraries * Path to libraries added for win32/64-vc-config.py, still commented out.
2011-11-03 12:40:15 +00:00
WITH_BF_BOOST = True
Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init. Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).
2011-11-09 17:22:55 +00:00
BF_BOOST = '${LIBDIR}/boost'
BF_BOOST_INC = '${BF_BOOST}/include'
Build system fixes: * Fixed Boost libs names after upgrade to 1.47 * Remove old reference to space_sound from cmake.
2011-11-08 20:56:55 +00:00
BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init. Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).
2011-11-09 17:22:55 +00:00
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
Scons: * Basic support for OpenImageIO and Boost libraries * Path to libraries added for win32/64-vc-config.py, still commented out.
2011-11-03 12:40:15 +00:00
CUDA * Added CUDA Binaries to Windows scons config files, disabled by default. Also the path to nvcc is commented out, best to set this in the user config, as it varies on each system probably.
2011-12-04 10:45:25 +00:00
#CUDA
Windows / Scons: * Disable CUDA kernel compile per default, so people who don't use it can compile file with the default config.
2012-04-30 09:06:19 +00:00
WITH_BF_CYCLES_CUDA_BINARIES = False
CUDA * Added CUDA Binaries to Windows scons config files, disabled by default. Also the path to nvcc is commented out, best to set this in the user config, as it varies on each system probably.
2011-12-04 10:45:25 +00:00
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
* WITH_BF_RAYOPTIMIZATION cleanup and flag separation by matd. This adds BF_RAYOPTIMIZATION_SSE_FLAGS through which one can manage what SSE flags are best for the platform built for. Note that the ray optimizations coded by jaguarandi are SSE-intrinsics only.
2009-12-10 00:51:13 +00:00
#Ray trace optimization
Runtime detection of SSE support for raytracing. Also enabled rayoptimization by default now on all platforms since it shouldn't crash anymore if SSE is not there. If this breaks compilation on some platforms, please let me know.
2010-06-24 15:54:01 +00:00
WITH_BF_RAYOPTIMIZATION = True
* WITH_BF_RAYOPTIMIZATION cleanup and flag separation by matd. This adds BF_RAYOPTIMIZATION_SSE_FLAGS through which one can manage what SSE flags are best for the platform built for. Note that the ray optimizations coded by jaguarandi are SSE-intrinsics only.
2009-12-10 00:51:13 +00:00
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
WITH_BF_STATICOPENGL = False
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
== 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
BF_OPENGL_LIB = 'opengl32 glu32'
* Use better option propagation everywhere lukep, I didn't touch darwin-config.py yet, because you're still working on it. But if you could see and make similar changes as I did to the rest.
2006-02-05 00:47:34 +00:00
BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
==SCons== * cleaning cruft away
2006-02-05 17:58:08 +00:00
'${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
'${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
* WITH_BF_RAYOPTIMIZATION cleanup and flag separation by matd. This adds BF_RAYOPTIMIZATION_SSE_FLAGS through which one can manage what SSE flags are best for the platform built for. Note that the ray optimizations coded by jaguarandi are SSE-intrinsics only.
2009-12-10 00:51:13 +00:00
==SCons== * added default compilers for darwin and win32-vc. Sorry orangers :) (Note: this was not slapping opportunity related to cross-compile) /Nathan
2006-03-13 12:00:01 +00:00
CC = 'cl.exe'
CXX = 'cl.exe'
== 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
Bumping up scons+msvc warning level to w1 so that we at least get some warnings out of it.
2012-01-06 04:07:09 +00:00
CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
CXXFLAGS = ['/EHsc']
* BGE optimisation tweaks.
2009-09-01 23:43:00 +00:00
BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
== 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 === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
==SCons== * Source Browser support. When BF_DEBUG=1 .bsc-files will be created in BF_BUILDDIR. .pdb-files are in the root source dir
2006-10-19 12:35:39 +00:00
remove some unused flags and correct aud example heading
2011-06-27 07:44:59 +00:00
CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
cleanup scons build flags, many duplicates because because of confusion between CFLAGS/CPPFLAGS/CCFLAGS/CXXFLAGS, devs would set multiple to be on the safe side. - defines go in CPPFLAGS - C & C++ flags go in CCFLAGS - CFLAGS / CXXFLAGS are C OR C++ only. also commented intended ghost unicode/ascii usage.
2011-10-21 04:23:26 +00:00
REL_CFLAGS = []
REL_CXXFLAGS = []
==SCons== * add REL_CFLAGS and REL_CCFLAGS when not building debug. This adds NDEBUG to compile on Win32 * fix path to makesdna binary
2006-02-04 15:44:34 +00:00
REL_CCFLAGS = ['-O2', '-DNDEBUG']
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +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
C_WARN = []
CC_WARN = []
=== SCons === * merge the recent scons changes from trunk, so this means that the same rules now apply: - scons-local available - platform default configs updated - check your user-config.py if you have made a full copy of default config Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
2008-11-07 19:21:52 +00:00
CXX_WARN = []
== 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
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD
2008-12-14 17:32:24 +00:00
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
== 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
own change to cmake files broke MSVC2010 with Debug configuration, reported by Alex K
2011-07-01 03:40:12 +00:00
PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', '/LARGEADDRESSAWARE', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
* merge main SConstruct and some of the utility scripts for our scons build from trunk. Note: I'll be working on improving our scons build environment in this branch Note2: I'll be upgrading our scripts to work fully with scons 1.0 (and possibly later)
2008-10-05 21:33:23 +00:00
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD
2008-12-14 17:32:24 +00:00
# # Todo
# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
# BF_PROFILE_LINKFLAGS = ['-pg']
# BF_PROFILE = False
* use release flags as default, except for openmp support
2008-10-02 06:22:36 +00:00
would not want to wait for 'that' on every build MS scons win32 skip calling makebsc by default
2010-04-01 23:58:12 +00:00
BF_BSC=False
== 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
BF_BUILDDIR = '..\\build\\win32-vc'
BF_INSTALLDIR='..\\install\\win32-vc'
Copy Permalink