Commit Graph

91 Commits

Author SHA1 Message Date
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
Jean-Luc Peurière
8787ad14a2 update to trunk r14104
blenderbuttons is good
and it compiles
2008-03-14 09:59:44 +00:00
Jean-Luc Peurière
a68a7f42b0 resolved conflict state with HEAD r14096
blenderbuttons still bad

not let this compile
2008-03-13 23:54:02 +00:00
Nathan Letwory
3796abf092 * on win32 with msvc USE_OPENAL was defined for the entire source. Made it so that it is defined only there where needed when needed.
* dxguid is necessary only when building WITH_BF_OPENAL=1. I already added the mingw version to our SVN in lib/windows/openal/lib and now I made sure it is linked against only when needed.
2008-03-06 21:01:55 +00:00
Jean-Luc Peurière
09bb791249 making the new transform methods work on Os X
getndof return a 7 floats array, but only the first 6 are axis
the last one is a delta and seems to be much smaller on windows systems
this value should be ignored for the moment
2008-02-18 16:31:25 +00:00
Joshua Leung
038c08804d It is now possible to compile a profiling build with mingw+scons.
Here are the changes I've had to make:
* Added default settings for BF_PROFILE and BF_PROFILE_FLAGS for mingw
* Made makesdna.c link with profiling flags too. This fixes some linking problems related to guardedmalloc for linking it. I'm not sure if this breaks compiling with BF_PROFILE on other platforms.
2008-02-06 01:25:56 +00:00
Campbell Barton
ce5f187d8a oops, left in a line I shouldnt have 2008-01-29 19:25:10 +00:00
Campbell Barton
0f8baa98ad added a note for scons openexr compiling, because I had some trouble using our own exr build and had to work out whats goin on. 2008-01-29 18:47:40 +00:00
Campbell Barton
2fa4ff4dac missing header from editipo.c 2008-01-19 19:01:19 +00:00
Campbell Barton
5a4fc7a8fd made BINRELOC disabled by default with scons, only enable for linux 2008-01-19 18:52:39 +00:00
Joshua Leung
e293eed865 Added "WITH_BF_BINRELOC = 'false'" for msvc+scons too 2008-01-19 03:24:12 +00:00
Joshua Leung
4ffd8d2a28 Disabled "WITH_BF_BINRELOC" for mingw 2008-01-18 23:13:07 +00:00
Kent Mein
320ac3f0e2 Fixing makefiles for binreloc I made it use flags like other
things default on for linux.  ideasman helped me get scons working.
Cmake still needs some love...

Kent
2008-01-18 21:39:47 +00:00
Joseph Eagar
f81bc543e7 =Scons ffmpeg link order update=
Update link order for ffmpeg on win32, patch provided by
Anders Nor "Debolaz" Berle on irc.
2007-12-26 10:59:08 +00:00
Joseph Eagar
139cb3c0bc =Scons ffmpeg update and avi fix=
Updated scons to work with the ffmpeg binaries in
lib/windows/gcc again.  Also fixed a bug reported by
Debolaz on irc.  Blender's internal avi reading (which can
only read simple formats like motion jpeg) was telling the
video code it could read all avis, without checking their
codec.

To fix this, I copied AVI_open_movie(), and modified it to
to replace AVI_is_avi().  Now it properly checks the codec,
and validates the header.
2007-12-25 06:48:45 +00:00
Peter Schlaile
637a22bcc3 == FFMPEG ==
Another fix for external ffmpeg building.
2007-09-27 07:19:10 +00:00
Peter Schlaile
41989bf1a7 == FFMPEG ==
Minor fix for using system's ffmpeg.
2007-09-27 06:53:21 +00:00
Peter Schlaile
54dca15a0e == FFMPEG ==
First round of scons support for internal ffmpeg.
2007-09-27 06:47:59 +00:00
Peter Schlaile
3596175859 == Sequencer / FFMPEG ==
Updated to latest FFMPEG-version, which uses new swscaler.
2007-09-23 17:16:13 +00:00
Jean-Luc Peurière
f596b2a156 change to darwin base config that stayed in the pipe 2007-08-30 18:59:33 +00:00
Jean-Luc Peurière
d27abcccdd new default for using openexr lib in our svn 2007-08-19 18:48:42 +00:00
Joilnen Leite
127a232a10 Reverting to python 2.5 and openEXR true as default 2007-07-30 16:44:35 +00:00
Joilnen Leite
443a64135e Font preview 2007-07-30 15:59:16 +00:00
Nathan Letwory
8ab62dc6c2 * make sure stdc++ is linked against. 2007-07-01 08:55:50 +00:00
Kent Mein
613646b33e 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
Nathan Letwory
5135ed7b0e * .base makes scons 0.97 puke. It is not needed anyway, so removing. 2007-06-15 06:37:21 +00:00
Jean-Luc Peurière
16340dfe12 adding the initial patch updated to 2.44 in ndof branch
notes : 
it compiles but is non functional
lacks the platform specific changes in ghost ( i cant test windows)
lacks the code for plug-in.

the platform specific code will be added when we sync with Ettore work
the plug-in itself cannot be added here
2007-05-29 04:34:09 +00:00
Jean-Luc Peurière
c0dcbacd4b post release update of the scons build system for os x powerpc
assume os x 10.4 as defaut
2007-05-19 22:57:28 +00:00
Nathan Letwory
3c5820e69b === FFMPEG on Win32 ===
* rebuilt ffmpeg libraries. h264 now actually works.
2007-05-06 22:13:38 +00:00
Stephen Swaney
5ca1910276 add -Wdeclaration-after-statement to warning flags for gcc 2007-04-12 18:20:00 +00:00
Robert Holcomb
d6411c206d newline at end of file 2007-03-24 19:13:02 +00:00
Robert Holcomb
0e939e61bf Reverted to previous version 2007-03-24 19:07:18 +00:00
Robert Holcomb
808a5fc05a Scons build system. MSVC 7.1 in a moment. 2007-03-24 18:41:54 +00:00
Nathan Letwory
113fa75449 === SCons ===
Update configs to use Python 2.5. To quote from IRC:

07:17  * stivs waves his +5 Mouse of Power and authorizes jestie to update all of scons to py 2.5.
07:17 < stivs> let the screaming begin!
2007-02-28 04:51:13 +00:00
Stephen Swaney
79ad751013 add some comments about libalut and a BF_OPENAL_LIB line
to uncomment if necessary.

libalut is becoming problematic.  some distros have it, some do not.
At least one considers it deprecated, iirc.
2007-02-26 20:50:50 +00:00
Martin Poirier
7bf2f72be4 === Transform ===
[ #5833 ] 2.43 RC2: Incorrect Bone rotation when 3D cursor set as Pivot

There's really ugly stuff going on with pose mode rotation in transform which I'll have to fix later, in the mean time, this commit fixes the problem (which happens when you rotate bones in post mode around an arbitrary point) and includes some juicy comments to further document the actual architectural problem.
2007-02-07 23:28:33 +00:00
Simon Clitherow
6f5512c3a6 Corrected IThread.lib to IlmThread.lib.. thanks Stephane :) 2007-01-01 12:01:41 +00:00
Simon Clitherow
87e4cf1283 Updating scons VC config to OpenEXR 1.4.0 2007-01-01 11:48:17 +00:00
Nathan Letwory
eb73025c63 ==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
Erwin Coumans
3b91d4e30a Step 1 of Bullet 2.x upgrade:
Temporarily disabled game engine for scons and Makefiles (nan_definitions?), this to upgrade to Bullet 2.x

scons for Darwin, Linux, BSD3, SunOS5, Win32, and Makefiles should not compile game engine right now.
CMake and MSVC needs still disabling of game engine.
2006-11-21 00:14:58 +00:00
Nathan Letwory
af0d38d6ef 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
Andrea Weikert
32d49a8dae ==== scons ====
- cleanup for wintab library headers
- properly define BF_WINTAB and BF_WINTAB_INC
2006-11-13 06:40:08 +00:00
Kent Mein
68300b6101 ICONV stuff was defined twice so cleaning it up.
Kent
2006-11-10 18:01:18 +00:00
Kent Mein
d1285dc756 This is really two commits but the first one is very small and affects one
file I modified for the other patch.  So I'm being bad and combining them
together.

First one is added -lXi to LLIBS for solaris.  (Makes it so it compiles
again with the tablet stuff added)

Second one is the real commit its an expansion of patch #4458
This adds optional ICONV lining to support international fonts in the
file selector.  Thanks to wisit venita (dripstone) I mostly just cleaned
it up a little and made it optional via defines.

Its currently turned off for all platforms except for solaris on scons.
For scons see your config/(platform).py file look for WITH_BF_ICONV
For the Makefiles look at source/nan_definitions.mk look for WITH_ICONV
(basically you'll want to export WITH_ICONV=true and possibly set some other
stuff)

Let me know if there are any problems.

Kent
--
mein@cs.umn.edu
2006-11-09 15:45:19 +00:00
Nathan Letwory
d1066fc266 ==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
Nathan Letwory
88446eeca4 Patch 5105 by Joshua Leung (Aligorith), slightly modified by me
* Add WITH_BF_YAFRAY, which per default is 'true', so no visible changes for developers (and users).

Set WITH_BF_YAFRAY to 'false', and you'll save some major compile time :) Also handy if you're strapped for memory and compilation fails on yafray compilation due
 to this.

- this commit also has a few whitespace changes and
- made BF_NO_ELBEEM a proper BoolOption. This will be renamed to WITH_BF_ELBEEM in the near future...
2006-10-18 05:45:47 +00:00
Nathan Letwory
1266234202 * remove the .Append(LIBS = ['libverse']), since it confused the build system.
* removed unused options BF_VERSE_LIBPATH, BF_VERSE, BF_VERSE_LIBS, since they are not used at all.
* some whitespace mods

There should be no more issues with "libverse.lib" not being found (or anything like
 that).
2006-10-11 07:28:37 +00:00
Nathan Letwory
278b242638 * add missing WITH_BF_VERSE to config files for completeness. Reported by Emanuel Greisen. 2006-09-05 08:36:42 +00:00
Nathan Letwory
5d40740671 * add debug flag so debug symbols are actually created when doing a 'scons BF_DEBUG=1' 2006-09-01 13:04:33 +00:00
Nathan Letwory
7fd8ce8156 * 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