Commit Graph

220 Commits

Author SHA1 Message Date
Brecht Van Lommel
d52400bfbd 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317
Notes:
* Sequence transform strip uses G.scene global, this is commented
  out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
  2.5 got merged, but no new files were added. Calls to these files
  are commented out with "XXX etch-a-ton". editarmature.c and
  transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
  (player still fails to link).
2009-03-17 21:44:58 +00:00
Campbell Barton
7fffb0b630 Building the game engine with Solid/Sumo is now optional for scons using WITH_BF_SOLID.
Now Sumo is has been deprecated for a while we might want to remove it for 2.5.
2009-02-25 12:07:51 +00:00
Joshua Leung
994f915b3c 2.5 - Fixed compiling for scons + mingw
jesterKing: please check on this, since it seems to be basic typos only? See my mail to the list for details of the error.
2009-02-21 03:26:03 +00:00
Nathan Letwory
64dd45ef43 2.5 / Scons | Building on 64bit Windows
* add preliminary support for building Blender on 64bit Windows with _msvc_. The SConstruct should automatically detect if you are on a 64bit Windows and if you have that 64bit build is assumed. If you're not, 32bit build is assumed.
  NOTE: this is still very much wip, so your mileage may vary. Do please report on b25 taskforce ML in case of trouble.
  NOTE2: many of the libs are being linked in statically
  NOTE3: hopefully I didn't break anything for other build platforms (mingw, linux, osx).
  NOTE4: comes after NOTE3
2009-02-20 22:08:02 +00:00
Brecht Van Lommel
8762737400 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD 2009-01-26 08:34:40 +00:00
Nathan Letwory
93d9e7749d 2.5 / SCons
I did a very drastic cleanup for the different libgroups, there's now only a few left. It compiled with scons/msvc, will be testing in a bit on linux, too.
If you get any problems, please reply to this commit message on the taskforce ML.
2008-12-23 16:07:24 +00:00
Benoit Bolsee
04ef5be177 FFmpeg upgrade to revision 12758 (avformat version 52.13): support libavdevice for video capture in VideoTexture module (BGE). Makefile, CMake, scons updated. FFmpeg binaries will have to be rebuilt for certain OS (irix), win32 binaries already up to date. You MUST do a clean rebuild after this patch. Scons users: pay attention that the config/<os>-config.py files have changed, adapt your user-config.py in consequence 2008-12-17 20:52:39 +00:00
Joshua Leung
7714f17eca Applying scons compiling fix for windows/mingw (to get compiler warnings to show up). This has already been applied in other branches too 2008-12-16 22:57:15 +00:00
Brecht Van Lommel
ec00764dd2 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD 2008-12-14 17:32:24 +00:00
Nathan Letwory
f4d823fa02 * blenderlite works now on windows too.
- when WITH_BF_SDL=True entry-point is mainCTRStartup (due to SDL)
  - with WITH_BF_SDL=False this should be just main
2008-12-07 13:22:50 +00:00
Joshua Leung
43b26b72ab View2D - Initial commit of Pan-View Operator
* Moved View2D data from space-data to ARegion (aka regions). This has been done because drawing occurs in regions not areas anymore. The View2D struct is currently stored in the ARegion struct (not as pointer), given that most of the regions in use will be 2D anyway (only the 3d-view's "window" region is the exception).
Added version patch code for outliner and timeline only for now. Headers are also likely to need this.

* Added separate keymap for View2D operators. All regions that use View2D will need this added. This includes headers too. 

* Pan view operator (ED_View2D_OT_view_pan), currently works for Outliner and Timeline. Use MMB-drag as before. 
- It currently doesn't exposed any parameters for redo (via RNA-ID-Props), but only uses some customdata. Suggestions on what these parameters could be are welcomed. 
- I've yet to implement the necessary axis-locking features for this panning (which is required in Timeline for example to prevent vertical panning, which moves the markers out of view).
2008-11-30 06:15:33 +00:00
Campbell Barton
bbc00befe7 some scons command line args were not working since recent changes-
scons CCFLAGS="-O0 -ggdp3" 
for example would pass on the args including the "'s to scons, causing the build to fail.
2008-11-18 05:47:19 +00:00
Campbell Barton
7cce946de7 copy over pthread dll to the install dir with cross compiling,
eventually should copy more libs but for now this makes blenderlite work 
- (used for automatic blender builds on graphicall)
2008-11-14 03:21:06 +00:00
Campbell Barton
934b21f5d9 for scons on linux and other *nux systems
only install locale data if international is enabled, only install fonts if freetype is enabled.
2008-11-13 02:18:35 +00:00
Brecht Van Lommel
b3c238e8bc 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
Nathan Letwory
999f312d62 Change the LCG_DIR usage to BF_name_LIBPATH where possible. FFMPEG can't be done like that yet, needs some extra thought to handle differences between vc and mingw setup 2008-11-12 07:48:53 +00:00
Nathan Letwory
418ee26c0e spaces -> tabs 2008-11-11 20:47:45 +00:00
Campbell Barton
483136c8e4 Adjusted scons files so disabling quicktime, python and sdl also removes their includes when building.
writefile.c had usless include.
2008-11-11 14:14:22 +00:00
Nathan Letwory
76320b76ad Change remaining Copy() to Clone() 2008-11-05 23:23:04 +00:00
Nathan Letwory
0bd7934be7 * Minimum SCons version is now 1.0.0
- Code has been changed to reflect this (ie. deprecated functions are not anymore used)
* clean up the C and C++ compiler flags mess.
  - in the environment construction of BlenderLib all the compile flag governing options have been split in the *C*, *CC* and *CXX* containing equivalents.
    C is for C compiler only flags. CC is for C and C++ compiler flags and CXX is for C++ compiler only flags.
    All the platform default config files need to be double checked and fixed wherever it looks necessary. Either DIY, or send me a note with needed changes.
  - a start for the BlenderLib parameter list has been made - all the SConscripts need to be checked and modified to hand in flags properly.
* A theeth request: make -jN settable in the config file.
  - I give you BF_NUMJOBS, which is set to 1 by default. In your user-config.py, set BF_NUMJOBS=4 to have 4 parallel jobs handled. Yay.
2008-10-30 23:55:07 +00:00
Campbell Barton
ac4ff83ca6 added scons option BF_WITH_PYTHON (defined as DISABLE_PYTHON) 2008-10-28 18:47:13 +00:00
Campbell Barton
bc55102eac renamed WITH_BF_BPYDOC to WITH_BF_DOCS, added SConscript for building BGE docs too. 2008-10-20 23:21:01 +00:00
Nathan Letwory
f1f27c0350 === SCons ===
[#17867] Adds option to SCONS to generate Python API documentation

Added patch from Brandano with some small improvements (BF_DOCDIR, clean) by yours truly.

To use make sure you have epydoc installed. Enable with WITH_BF_BPYDOC=1.
2008-10-19 22:01:46 +00:00
Ken Hughes
a6b1c0a8cc Added WITH_BF_NOBLENDER to scons so that blenderplayer can be compiler by itself (false by default). Also added dependency for 'blender' on command line; seems 'blender' was intended to be a target, but would give the error "Do not know how to make target `blender' ". 2008-10-19 21:25:17 +00:00
Ken Hughes
4693a5af48 Linux platforms
---------------
Patch to include freedesktop icons in linux release builds, contributed by
Ralf Hölzemer (cheleb).
2008-09-19 21:00:45 +00:00
Campbell Barton
15bce017df scons update, BF_NO_ELBEEM wasnt working, WITH_BF_SDL wasnt implimented, WITH_CCGSUBSURF isnt used anymore. 2008-09-19 01:39:34 +00:00
Campbell Barton
8d1163c639 scons options BF_CXX, WITH_BF_STATICCXX, BF_CXX_LIB_STATIC for static linking to stdc++ because of problems running blender on some systems. 2008-09-18 03:05:02 +00:00
Campbell Barton
0f39be9ce8 added static openal and openexr options for scons.
also added a target 'blenderlite' - turns almost everything off, compressed binary is ~3.4meg
2008-09-16 06:31:55 +00:00
Daniel Genrich
8d285fc10a Fix for better icc + openmp support using scons 2008-08-04 17:24:11 +00:00
Stephen Swaney
6613ac0d88 Change plugin.def to pluging.DEF for case sensitive operating systems.
File is source/blender/blenpluginapi/plugin.DEF
2008-05-01 14:22:21 +00:00
Nathan Letwory
4e9cbe2ac7 * copy plugin header stuffies too. 2008-05-01 13:54:25 +00:00
Nathan Letwory
7d1b40d890 * improve the clean code. Instead of doing it the dumb way, do it smarter. 2008-04-28 19:48:44 +00:00
Nathan Letwory
a9ab9f4bde * make sure makesdna executable gets removed on scons clean. 2008-04-28 17:14:20 +00:00
Nathan Letwory
1da7742b8a * change BF_CONFIG so that it is understood as 'user-config.py' instead of config/platform-config.py it tried to do before. If defined, it overrides the search (and potential use) of user-config.py.
It didn't work before anyway, so this change should affect nobody.
   usage: scons BF_CONFIG=someconfigfile
2008-04-27 20:17:14 +00:00
Ken Hughes
e10cb55936 Make "scons clean" remove config files for ffmpeg, x264, xvidcore. Also
replace tabs with spaces.
2008-04-27 19:20:35 +00:00
Nathan Letwory
6553b71271 * let's copy *all* FFMPEG libraries, shall we? 2008-04-27 19:13:40 +00:00
Nathan Letwory
7e7118aebb * copy FFMPEG libraries on Windows to BF_INSTALLDIR when done. 2008-04-27 17:00:22 +00:00
Ken Hughes
a1689a5e9a Change scons so OpenMP library is appended at end of linkage line with other
libraries (fixes a problem with statically linking OpenMP).
2008-04-17 19:01:00 +00:00
Chris Want
5d0a207ecb Patch from GSR that a) fixes a whole bunch of GPL/BL license
blocks that were previously missed; and b) greatly increase my
ohloh stats!
2008-04-16 22:40:48 +00:00
Campbell Barton
9aa985abe6 minor edit to last commit, fixed a possible python error 2008-04-08 20:08:46 +00:00
Campbell Barton
dba13f922a use mkdtemp for the scons tempfile path rather then '.sconf_temp', this way 2 blenders can be compiled at once from the same path. (debug and release for instance, as long as they build in their own dir) 2008-04-08 17:01:11 +00:00
Jean-Luc Peurière
126ab7974d NDOF support added to trunk from ndof branch.
The latter is now obsolete and will be soon 
removed.

Some tiny build tweaks for darwin committed
in preparation of bigger changes for proper
SDK suport both on intel and ppc
2008-03-22 01:39:11 +00:00
Nathan Letwory
285870d53b * BF_QUIET can now be set in user-config.py too. 2008-03-19 17:23:14 +00:00
Daniel Genrich
3a7b420ec6 Bugfix for wrong OpenMP flags when using icc (proposed by jensverwiebe via IRC) 2008-03-05 14:58:33 +00:00
Nathan Letwory
23aad3c5fe * change integral type of loop var in two cases so OpenMP support compiles with MSVC, too.
* remove wrong flag.
2008-02-11 08:27:54 +00:00
Nathan Letwory
ebbe718237 * Building with FFMPEG-support on Windows works only for mingw. And those libs are static anyway. 2008-02-04 06:44:13 +00:00
Daniel Genrich
77685023ca Initial commit of cloth modifier from branch rev 13453 2008-01-29 21:01:12 +00:00
Nathan Letwory
eb5643fcd0 * copy python25_d.dll when building BF_DEBUG=1 2008-01-24 07:25:02 +00:00
Nathan Letwory
381e8b16b4 A little christmas present for the lazy coders.
In your user-config.py you can now set BF_FANCY='false' and enjoy the... lack of colors
2007-12-20 17:52:57 +00:00
Campbell Barton
4cb953e60e scons clean would throw an error if there was nothing to do. print a message instead. 2007-08-31 19:17:22 +00:00