Commit Graph

161 Commits

Author SHA1 Message Date
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
Kent Mein
d10797a23e was:
BF_FFMPEG_LIBPATH =  '$(BF_FFMPEG)/lib'
Needs to be:
	BF_FFMPEG_LIBPATH =  '${BF_FFMPEG}/lib'

There are some commented out ones that should maybe be switched as well
so it doesn't happen again but this fixes the problem for now :)

Kent
2006-08-14 17:16:51 +00:00
Nathan Letwory
800ae7cf46 [ #4035 ] patch to make scons compile with ffmpeg in mingw
Submitted by Joseph Eagar (joeedh). windows/gcc ffmpeg library may need recompiling to support all codecs necessary (ie. H264 doesn't work).
2006-08-14 12:47:13 +00:00
Kent Mein
6c89868386 Adds scons support for SunOS...
(I have one small problem with linking python's static library but
other than that this should work)

Kent
2006-08-03 02:46:37 +00:00
Ken Hughes
9cc25e5a15 Make scons pick up default link flags from previous commit on linux platforms;
statically-linked python releases won't work otherwise.  Bugfixes for #4676
and #4486.
2006-07-14 04:13:55 +00:00
D.J. Capelis
6a72f9f61d Changing some default link flags, crossing fingers and waiting for bugs to
magically be fixed.
2006-07-14 02:02:57 +00:00
D.J. Capelis
10d6a50ae0 Correcting order for static linking. 2006-07-03 10:00:56 +00:00
Andrea Weikert
98b8b876b6 - changed back SHGetFolderPath to SHGetSpecialFolderPath to support older Win98 and Win95 systems without having to redirstribute shfolder.dll
- MINGW should compile too now (was problem when fucntionality was first introduced), tested with MINGW 5.0.2 (scons)
- added -lshell32 for the dependency on MINGW
2006-06-12 19:13:17 +00:00
Ken Hughes
a57bb6bee1 Bugfix #4081: support for OpenBSD platform for scons. Big thanks to Nathan Houghton for this contribution. 2006-06-05 15:52:26 +00:00
Stephen Swaney
d45b13ea64 support for ffmpeg in linux. default is no.
set BF_OPENGL to /usr rather than /usr/lib.  thx Ken!
2006-06-04 16:46:55 +00:00
D.J. Capelis
2be9d80b5a Reordering OpenEXR libraries to correctly reflect dependencies.
This fixes some ld errors when the static versions of the EXR libs are used.
2006-04-06 20:11:06 +00:00
Andrea Weikert
a89905d6fa === MINGW compile ===
Fixing compile for Windows mingw builds with cygwin make and scons.
Used SHGetFolderPath instead of SHGetSpecialFolderPath which is
better supported for mingw.
Thanks to Ralf Hoelzemer for the tip and the patch.

Let me know if any problems persist, I'll try to fix then.

--- Andrea
2006-03-20 17:25:42 +00:00
Nathan Letwory
b92c2197ec ==SCons==
* Applied patch #4012 by Joseph Eagar. The patch provides a way to quickly assign a list
  of libraries to build with debug symbols. Usage:

  scons BF_QUICKDEBUG=src,bf_blenkernel,bf_blenlib
2006-03-17 16:38:39 +00:00
Nathan Letwory
fd54be1d46 ==SCons==
* Link to png_st. Jens reported linking with dynamic lib crashed, but with static doesn't.
2006-03-16 19:16:26 +00:00
Nathan Letwory
cf6c497d6f ==SCons==
* CC and CXX for linux2
2006-03-14 12:20:04 +00:00
Nathan Letwory
16c0f8bfae ==SCons==
* If you look quickly somewhere else, you won't notice the missing ''s
2006-03-13 13:45:11 +00:00
Nathan Letwory
9be2af4523 ==SCons==
* Begin of the week, so I wanted to fill my commit quota right off the bat.
  Add CC and CXX defaults for mingw, too. Unless we have invisible configs
  this should be the last one :S
2006-03-13 13:42:56 +00:00
Nathan Letwory
7f8e6aadf4 ==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
Nathan Letwory
36a4af22c3 ==SCons==
* These changes bring cross-compiling Blender for Windows on Linux one step
  closer to reality. The 'biggest' change is in makesdna SConscript to make
  sure a linux native makesdna is built, that can be run, too. Next to that
  proper checks for env['OURPLATFORM']=='linuxcross' are added in various
  places.

  Switch change in pluginapi.c was necessary, and AFAIK it should work like
  that also on WIN32, if not, slap me.

  Note: everything *compiles* now nicely, it is just that the final *linking*
  doesn't work (yet). Anyone who fixes this will be the
  hero of cross-compilers :)
2006-03-13 11:42:49 +00:00
Jean-Luc Peurière
f36e5fc1f4 changes in darwin config.py to reflect Nathan changes & better defaults.
Important note : for gcc3 linking you may have to remove -fexceptions
from LINKFLAGS but this is mandatory for gcc4
2006-03-11 13:33:52 +00:00
Nathan Letwory
595b4158ba ==SCons==
* a comma was missing from a list :S
2006-03-11 13:15:39 +00:00
Nathan Letwory
a71c07a044 ==SCons==
* change CCFLAGS to CXXFLAGS and CFLAGS to CCFLAGS to be better
  for SCons
- removed old cruft from ancient system
2006-03-10 20:11:48 +00:00
Nathan Letwory
d9f9e76500 ==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
Nathan Letwory
e377a5f721 ==SCons==
* Use same warning flags as with linux2, greatly reducing noise in
  output during compile. Also for developers using win32/mingw now
  in effect: correct *each* and *every* warning in your code. I
  command you to!
2006-02-25 10:40:31 +00:00
Nathan Letwory
8dd19059fc ==SCons==
* Warning flags I had dutifully copied from sirdudes yet unpublished
  make rewrite turned out to be the Paranoia flags, causing the flood
  of warnings. Using better flags instead (like current Makefile level 1).

  All developers on Linux that use SCons for building - (new) code you write is
  supposed to be *entirely* warning-free from now on (Ton said so!)
2006-02-25 01:06:02 +00:00
Nathan Letwory
30a9f0b053 ==SCons==
* accidently left WITH_BF_STATICOPENGL enabled for non-linux. tsktsk.
2006-02-21 14:24:08 +00:00
Nathan Letwory
11fd198a70 ==SCons==
* when WITH_BF_STATICOPENGL=1 on Linux Blender will be statically linked
  against GL libraries. NOTE: I used values that worked on my machine -
  platform managers and people who have better knowledge about this, please
  modify config/linux2-config.py accordingly.
2006-02-21 12:36:50 +00:00
Nathan Letwory
0876e99ccf ==SCons==
A working configuration file for win32/mingw, provided by Rehno Lindeque.
Thanks!
2006-02-19 19:33:36 +00:00
Nathan Letwory
f92bf08d1e ==SCons==
* cleaning cruft away
2006-02-05 17:58:08 +00:00
Nathan Letwory
896b6288ca ==SCons==
* remove useless BF_TIFF* options. Upon closer inspection of code, only
  path to headers is needed
2006-02-05 17:50:19 +00:00
Nathan Letwory
1d6a2adc0e * option propagation also for darwin :) 2006-02-05 16:25:38 +00:00
Nathan Letwory
3c9494bbfd * reflect WITH_BF_INTERNATIONAL changes into (platform)-config.py files too 2006-02-05 12:27:49 +00:00
Jean-Luc Peurière
a91c077152 packaging in bundle of the Os X binary. result in the bin of build dir
Important note, the install target install only the binary not the
packaged bunde for the moment
2006-02-05 11:28:28 +00:00
Nathan Letwory
257124a44f - remove Xmu and Xext from linking line for linux2, as they are not needed
+ WITH_BF_OPENAL actually enables or disables use of OpenAL
+ WITH_BF_OPENEXR removes openexr libs from linking if disabled
2006-02-05 11:11:44 +00:00
Nathan Letwory
3d3f5d1640 + WITH_BF_OPENAL=0 should now actually not need OpenAL stuff
* BF_PROFILE_FLAGS to list form
2006-02-05 01:09:40 +00:00
Nathan Letwory
ea539ab643 * 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
Nathan Letwory
cb2f833aa5 * Made options evaluate differently, so setting one option properly
propagates to related options:

  In (platform)-config.py
    BF_PYTHON_VERSION = '2.4'
    BF_PYTHON_INC = '/usr/include/python${BF_PYTHON_VERSION}'

  In user-config.py
    BF_PYTHON_VERSION = '2.3'

  This will now have BF_PYTHON_INC evaluate actually to
  '/usr/include/python2.3' and not to '/usr/include/python2.4' as with
  the old way. Reported by Chris Want.

  Todo: also use in other platform configurations.
2006-02-05 00:03:51 +00:00
Jean-Luc Peurière
727f832003 more sensible defaults for new scons on Os X :
- python 2.3   if you want python 2.4 add the 2 following lines in
               user-config.py :
              BF_PYTHON = '2.3'
              BF_PYTHON = '/library.Frameworks/Python.framework/Versions/'

- disabled libtiff by default. new scons force lib linking &  it shouldnt
  will work on that
- added SystemStubs lib that 10.4 require in some circumstances.
  10.3 users may have to remove it with this line :
              LLIBS = 'stdc++'

additional notes :

OpenEXR libs and includes are searched in /usr/local
use by preference gcc3.3 gcc4 need some new libs i will commit shortly
you get in final an unpackaged binary. take a previous blender app  and use
show package content command to navigate to Contents/MacOs. replace the
binary there by new one, and voila, you have a working new app.

will commit shortly the automatic packager
2006-02-04 22:16:01 +00:00
Nathan Letwory
41356305ee ==SCons==
* wrong format of two vars made darwin compile barf
2006-02-04 16:30:51 +00:00
Nathan Letwory
e48ed941a0 ==SCons==
* If you set C_WARN=[] and CC_WARN=[] in your user-config.py, no complaints
  whatsoever should show. Otherwise a lot of warnings are shown.
2006-02-04 15:52:55 +00:00
Nathan Letwory
c0234bd9ec ==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
Nathan Letwory
3bb82a27fc == 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