Commit Graph

41 Commits

Author SHA1 Message Date
Campbell Barton
16dccd3ffd exiting wasnt working (was raising errors), also use dict.keys() rather then appending from iteritems, 2008-07-09 00:58:57 +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
Joseph Eagar
31b04490d1 removed mingw from the list of platforms to use the
debug python lib, as it was causing link errors.

if someone wishes to figure out why this is messing up,
go ahead.
2008-02-26 00:04:54 +00:00
Daniel Genrich
7a7a52226f makes bullet independant from gameengine for cmake, introduces esc-key during sim, disables collisions when no bullet there 2008-01-29 23:13:31 +00:00
Kent Mein
90715580b9 This is patch: [#7129] Solaris build is linking with c instead of c++ compiler
I talked to Jesterking and he may switch this to a more global
solution later.  I figured in the meantime its ok to commit this
and consider the issue resolved.

Kent
2007-12-06 21:41:22 +00:00
Campbell Barton
c6667c53e3 put the revision number in the splash screen (scons and make) 2007-11-15 12:16:03 +00:00
Andrea Weikert
70edf4e293 fixing some compile problems with MSVC7.1/scons
* stupid misplacement of declaration
* replacing fmodf with fmod (fmodf not available with MSVC7.1 when compiling C-code)
* appending CXXFLAGS to CCFLAGS in tools/Blender.py to avoid linking errors with runtime library (/MT not set) 
  - jesterKing, could you please check if that's ok?
2007-09-23 13:52:08 +00:00
Jean-Luc Peurière
42b629a69b add the option of not installing to scons build system
settting WITHOUT_BF_INSTALL='true' will disable
 the copying to INSTALL_DIR

you can use that in your user-config.py or commandline

slipping in minor cleaning for Os X builds
2007-08-14 20:55:59 +00:00
Nathan Letwory
475d4ce227 * svn+ssh test 2007-05-22 22:20:35 +00:00
Stephen Swaney
4e66d4e676 fix mashup of CCFLAGS and CXXFLAGS for scons builds.
CXXFLAGS defaults to CCFLAGS which was causing duplicated or
extra compile flags being set for g++.  Fix is to use
env.Replace() rather than .Append() the first time we
set CXXFLAGS in the build environment.
2007-04-13 06:30:34 +00:00
Nathan Letwory
581970a640 === SCons ===
* enable TWEAK_MODE with BF_TWEAK_MODE=1 on cmd-line. Can also be specified in user-config.py
2007-04-05 05:14:50 +00:00
Nathan Letwory
48b07b4822 ==SCons==
* link against debug library of python on win32
2006-11-24 06:08:05 +00:00
Kent Mein
14b6fd1209 Tweaks for ICONV stuff in scons.
Kent
2006-11-10 17:59:40 +00:00
Nathan Letwory
7c3cdb21a3 * control the creation of .bsc files when BF_DEBUG=1 on win32-vc. BF_BSC=1 (default for BF_DEBUG=1) will have .bsc generated, but this takes an awful long time, so BF_BSC=0 will skip that step. 2006-11-03 08:13:01 +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
Jean-Luc Peurière
0efdd46cea fixing scons build for Os X with verse enabled.
there is no need to bundle the verse binary.


Blenderplayer build is still broken. Verse maintener please add
the needed stubs for it
2006-10-03 20:25:59 +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
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
Jean-Luc Peurière
88bfc44ca2 some of the .po file had empty msgids and multilline comments from
generator which were making garbage of some sub-menus.
generated fresh .mo files
added a missing copy in appit for Os X
2006-06-27 21:48:54 +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
Stephen Swaney
c538f3e19f tweak SCons to use Split() to parse BF_DEBUG_FLAGS and BF_PROFILE_FLAGS
properly when they have multiple options.
2006-03-14 18:28:47 +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
Nathan Letwory
52dfa31cb8 ==SCons==
+ Joseph Eagar provided a patch that re-enables the application icon for Blender. Hurray!
2006-03-10 20:47:34 +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
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
Peter Schlaile
250c9de1bc Adds ffmpeg-support on Linux-platforms. Since ffmpeg is installed
always statically (you have to force it to build a dynamic library) the
resulting binary is redistributable.

The code is made ffmpeg-version independent using #ifdef's.
2006-02-05 19:49:29 +00:00
Nathan Letwory
ffcbde116e ==SCons==
* make sure PLATFORM_LINKFLAGS are used on Cygwin, too
2006-02-05 18:03:02 +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
9b36ffca12 * add proper WITH_BF_TIFF checks 2006-02-05 17:29:22 +00:00
Nathan Letwory
631a8d85d4 * WITH_BF_GETTEXT and WITH_BF_FREETYPE are merged into WITH_BF_INTERNATIONAL
* typo in adding BF_OPENAL_LIBPATH, resulting in it not being added at all
2006-02-05 12:24:52 +00:00
Nathan Letwory
c5a0e79fb0 - removed redundant code 2006-02-05 12:08:32 +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
4e82647e86 ==SCons==
+ BF_BUILDINFO=1 (by default) for build info in splash
- remove redundant renderconverter include dir
* check for win32-vc instead of only win32, so MingW compile goes ok
2006-02-04 16:36:37 +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