Commit Graph

301 Commits

Author SHA1 Message Date
711ba795f7 ignore __pycache__ dir for scons and cmake installation (py3.2 caches modules here). 2011-02-09 00:45:16 +00:00
Nathan Letwory
7c31042c6e And on your left you can see something much nicer (while I fix this here on your right). 2011-01-27 19:49:43 +00:00
Nathan Letwory
71cb745941 Commit to cope with API changes in OpenCOLLADA (latest for Windows right now r827). 2011-01-27 19:39:06 +00:00
Nathan Letwory
9924ade102 test commit for svn link in commit mail, part two 2011-01-17 10:47:31 +00:00
Nathan Letwory
637f4273aa test commit for svn link in commit mail 2011-01-17 10:43:51 +00:00
Nathan Letwory
6278cda106 Compiling and linking blenderplayer statically now works too. This brings it in line with blender linking line.
Small patch by Sergey Sharybin
2010-12-27 09:01:57 +00:00
Nathan Letwory
a8febab31b Workaround for blenderplayer not linking on linux with scons.
Maybe as a next big, uncool project would be: solve bad level calls.
2010-12-21 00:21:42 +00:00
Nathan Letwory
c0314f1041 Make sure plugins/ goes under shortversion/ dir 2010-10-26 22:13:37 +00:00
Nathan Letwory
bff1bef6bb Fix SCons for [#23833]. Ensure that empty dirs will exist too. 2010-09-15 14:50:14 +00:00
Nathan Letwory
6c113b54b3 Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00
Nathan Letwory
92422ba452 Patch [#23389] Add authorship information to exported COLLADA files
Contributed by Imran Syed (freakabcd).

This adds basic authoring tool and author info ("Blender User" for now).

NOTE: Linux and OSX users need now to update their OpenCOLLADA libs - Blender should now compile fine with their latest revision.

Made some changes to the original patch to ensure linking is done correctly.
Some small cleanups for scons too.
2010-08-26 06:58:32 +00:00
Nathan Letwory
4fe2c63e6d Skip also SVN administration files that start with _ instead of . 2010-08-22 00:07:23 +00:00
957976882d 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
ec2c52c9c8 SCons
- remove scons option WITH_BF_FHS, its not needed anymore.
- comment WITH_BF_DOCS, was using epydocs which we dont use now.
- blenderlite target was broken, always using openmp.
- building without python wasnt working.

- fixed some warnings.
2010-08-02 16:27:41 +00:00
Nathan Letwory
f054ecd37a libjack.dll not needed anymore 2010-07-19 10:15:49 +00:00
266438b5e0 - Use correct paths for mstoolkit and crossmingw tools in sconscript
- Use _stat64i32 instead of _stat in BLI_exist
  Needed for correct compilation by mingw, no sense for msvc
  (_stat is equivalent to _stat64i32 in Visual C++ 2005, and later i suppose)
- Added library msvcr90 for mingw to solve linking error to _stat64i32
2010-07-19 09:02:27 +00:00
Nathan Letwory
18c82ce390 Make SConstruct look in build_files/scons/tools and import from there, so no more 'import tools.Blender'.
This fixes problem after change to this new location, but with .pyc files still lingering in old tools/
directory that still got imported due to syspath form.
2010-07-14 16:38:09 +00:00
d80d6e2812 re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config 2010-07-12 18:26:35 +00:00
Nathan Letwory
1c35121213 == SCons ==
Updated to comply with datafiles filepath patch.

I've tried to do some changes for OSX too, but I'm not sure if they're correct,
so OSX people, please test and report.
2010-07-05 07:06:19 +00:00
ca81aa704e Patch [#22339] File/installation paths changes
Patch Tracker: http://projects.blender.org/tracker/?func=detail&aid=22339&group_id=9&atid=127

This patch implements the proposal outlined here:
http://wiki.blender.org/index.php/Dev:2.5/Source/Installation/Proposal

Original patch by Matt Ebb.
Contributions by Nathan Letwory, Damien Plisson and Andrea Weikert

NOTE:
This is a work in progress commit, some work still needs to be done on the SCons and CMake files for this to work properly, but at least should compile and the files should be created in the right directory.

Commit discussed on IRC with Ton and Campbell.
2010-07-04 15:35:23 +00:00
Nathan Letwory
24d5a1ce3a Show whether BF_DEBUG=1 or 0 in output. 2010-06-05 11:56:55 +00:00
54d764095f disable openmp for blenderlite scons target 2010-06-03 18:25:03 +00:00
Nathan Letwory
c8b88dde88 remove non-informative print 2010-05-30 13:58:17 +00:00
Nathan Letwory
d17c4e2f91 Copy zlib.dll for win64 too. 2010-05-26 11:25:33 +00:00
4324dc8389 Changes for static linking to libtiff when compiling by MinGW:
- Use static tiff libraries from lib/windows/gcc in
  scons configuration files
- Commented libtiff.dll installation in SConstruct
2010-05-24 12:41:14 +00:00
735559f0da Fixes for cross-compilation:
- Set env['CC'] and env['CXX'] as default values for
  CC and CXX variables. This fixes problem with overwriting
  auto-guessed compilators when reading config files
- Added new prefix for mingw tools
2010-05-23 21:20:13 +00:00
Ken Hughes
8d2e51f559 scons build systems
-------------------
Revert inadvertent ffmpeg changes.
2010-03-08 20:37:45 +00:00
Ken Hughes
1f470ab1b4 scons build systems
-------------------
Allows static libs to be passed correctly to the linker (i.e., full paths to 
libs which end in ".a" are passed to linker without processing).  I've been
using this on linux release builds since sometime around 2.49 without problem
but hesitated to commit since I don't know if it would affect any other
platforms.  If you're using static libs on another platform and it breaks,
let me know.
2010-03-08 20:32:17 +00:00
8a31fab304 Win64: Bugfix for non working scons, thanks to matd for the fix!
jesterKing: please check if the win32 dll's aren't needed anymore. Seems that they are compiled into ffmpeg, right?
2010-02-22 22:56:28 +00:00
b896a007ea Scons fixes:
- Removing alut
- Minor changes in linux ffmpeg default config.
2010-02-18 15:59:20 +00:00
6c9aa76d21 revert joes commit and apply change from Aligorith.
remove scripts dir only.
2010-02-13 10:55:04 +00:00
606398fa2f scons option - WITHOUT_BF_OVERWRITE_INSTALL
only use this if your not making packages for others.
2010-02-12 12:29:39 +00:00
97c70ee593 Tweak to the changes from r26820 (nuking scons install directory):
Those changes made developing Blender using scons as buildsystem impractical. They were nuking my various configs everytime I compiled resulting in a long wait for all the files to get copied over again at the end, or else I'd have to manually go scouting out files to copy over. 

Now, made this only nuke the scripts directory there which IMO solves the main issues that the original commit intended to solve (outdated scripts lingering in that folder, and mixing with the new ones). 

If there are complaints that only doing the scripts dir is not enough, then we better just make this destructive stuff an optional thing (i.e. by default, nuking will still occur, but at least developers can disable)
2010-02-12 09:18:10 +00:00
6c775defd4 Clear scons installation directory when WITHOUT_BF_INSTALL is disabled.
After discussion with Brecht and Martin we agree this is best long term.

Also fixed "scons blenderlite" for python and fluid.
2010-02-11 22:02:27 +00:00
ef2dfbc390 2010-02-01 19:53:51 +00:00
676cc6d6c8 libpng.dll is not included in our libs on win64 2010-02-01 19:17:47 +00:00
f2a8bb3498 this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit 2010-02-01 18:39:41 +00:00
caf067576e changes to get MingW compiling and cross compiling working, patch by Sergey Sharybin 2010-01-30 22:46:25 +00:00
Nathan Letwory
4d2c55824e * don't copy .pyc files 2010-01-15 09:59:42 +00:00
7d251de01c view3d bg image now updates on frame change, and the panel for it properly draws an image user template. someone else might want to look over the UI stuff, hopefully it's ok. also added some ffmpeg .dlls to the SConscript to install. 2010-01-14 02:16:45 +00:00
77c539458a Fix plugins source install for real.
Previous fix created a double /plugins/plugins tree.

This should work on all platform (no longer using split when it shouldn't, not creating lists for nothing, ...).
2009-12-14 18:13:18 +00:00
2c977b83b3 Scons:
* Sequencer and textures dir (and the makefiles for that) go into the /plugins folder again, as it should be. 
* Don't generate a "doc" dir, when building them is disabled. 

Patch by Matt. D. Thanks a lot!
2009-12-14 17:40:12 +00:00
a9e79d255d scons update to enable build with QTKit (Cocoa Quicktime)
Thx Jens Verwiebe for the patch
2009-11-18 15:54:25 +00:00
Nathan Letwory
46487ad59e == COLLADA ==
* fix win64 build and add proper library usage for COLLADA 64bit. Update also lib/win64 (r24263).
2009-11-02 23:55:04 +00:00
b1a832a7e2 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
Nathan Letwory
6282b7998b * copying of python31.zip and zlip.pyd is not necessary anymore, since the zip is unpacked by default to .blender/python/lib 2009-10-06 14:25:55 +00:00
Nathan Letwory
edfb47ffb4 * Copy() -> Clone() (even though these hopefully will be obliterated from extern/ soon)
* remove reference to docs SConscript
* python dbg commit - somehow this one was left uncommitted when I was working on r23465 and r23464
2009-09-28 15:49:26 +00:00
2d797f35d8 - removed 2.4x release/scripts
- moved release/io and release/ui into release/scripts/io, ui
- updated scons, cmake, make

When porting 2.4x scripts back, use a command like this so as not to loose the commit history...
 
 svn cp https://svn.blender.org/svnroot/bf-blender/branches/blender2.4/release/scripts/raw_import.py release/scripts/io/import_raw.py
2009-09-28 03:19:52 +00:00
Nathan Letwory
ebbb4ad753 * 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
e7abdd7d56 Better unix filesystem integration as documented here
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/Unix_FHS

for scons WITH_BF_FHS enabled an alternative layout eg.
scons WITH_BF_FHS=1 BF_INSTALLDIR="/usr/local"

for CMake just run "make install" after make (CMAKE_INSTALL_PREFIX is used for the base path)

Currently only scripts use both the system and user path correctly, other areas of blender have their own path code inline with lots of ifdefs, needs to be carefully updated.
2009-09-21 03:16:26 +00:00