Commit Graph

156 Commits

Author SHA1 Message Date
Chris Want
bfaa86b773 Disabling the code is revision 1.161 that was tripping up users
building with mingw.
2006-12-10 17:22:47 +00:00
Nathan Letwory
2f3c52bd67 ==SCons==
If win32all (http://sourceforge.net/project/showfiles.php?group_id=78018) is found,
 use it to be able to build with scons/mingw in (very) long paths. If it is not found,
 don't do anything groovy. This should make it possible to merge the cut up src lib.
 Those concerned, please do test that.

This bit of code is from http://www.scons.org/wiki/LongCmdLinesOnWin32
2006-11-30 12:39:09 +00:00
Nathan Letwory
48b07b4822 ==SCons==
* link against debug library of python on win32
2006-11-24 06:08:05 +00:00
Nathan Letwory
6c5c74244a whitespace commit 2006-11-21 05:56:41 +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
Kent Mein
14b6fd1209 Tweaks for ICONV stuff in scons.
Kent
2006-11-10 17:59:40 +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
859ea2fc01 * make verse compile with new verse release
* added -src/-dst patch from Emil (on my request - is already in verse CVS)
2006-10-03 11:33:41 +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
Nils Thuerey
f21f3cb290 - modified patch #4681, for scons compiling
of the fluidsim can now be disabled with the
	flag: BF_NO_ELBEEM='true', e.g. for irix systems.
	(The number of ifdefs from the original
	patch was reduced, and the defines are now
	only necessary when elbeem is switched off.)
- particle generation option is available again
2006-08-22 11:18:00 +00:00
Simon Clitherow
a6aa6b9ff4 =Scons=
Some additional external files were needed for correct running on
Windows - libtiff.dll, python24.zip, /release/windows/extra/*.*
2006-06-23 18:52:31 +00:00
Ken Hughes
9262cdbd0e Remove "print sys.version_info" accidentally left in from debugging. 2006-06-12 03:20:29 +00:00
Ken Hughes
e7a85df91e Bugfix #4089: Some Linux distros are using newer versions of OpenAL which
have FreeAlut (the OpenAL Utility Toolkit) separated out into libalut.  Added
a configuration test to check for libalut and add to LIBPATH if detected.
2006-06-04 15:54:23 +00:00
Ken Hughes
92e954e07a ===scons===
Bugfix #4088: Fix scons so that it installs subdirectories of release/scripts
into .blender/scripts.
2006-05-15 16:56:32 +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
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
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
2f8f1b8cdf ==SCons==
+ When giving CC and CXX on the command-line you can specify what compiler
  to use:

  scons CC=gcc-3.3 CXX=g++-3.3
2006-02-23 21:08:40 +00:00
Nathan Letwory
be5429dcf4 ==SCons==
+ install blenderplayer to BF_INSTALLDIR after successful build
2006-02-07 22:41:17 +00:00
Nathan Letwory
ef1b7a5735 ==SCons==
+ 'scons blenderplayer' builds blender AND blenderplayer now (tested on Linux
  only, but was only linking issue, so should work on other platforms too).

  NOTE: I noticed some compileflags for GE specific libs that were left out -
  I re-enabled them in the SConscripts, but I'm going to do a test build my-
  self now, so if there are problems with them on win32, I probably already
  know about them :)
2006-02-07 21:24:36 +00:00
Nathan Letwory
43c95ee9f2 ==SCons==
+ Add python24.dll to list of needed dlls for install
2006-02-06 12:47:11 +00:00
Nathan Letwory
d7e5f37172 ==SCons==
* Fix typo in bullet SConscript
* win32-vc now copies all necessary files to BF_INSTALLDIR, including dlls
2006-02-05 18:48:01 +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
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
eb5705374e * argh, sleep deprivation getting upper-hand - I accidently left an Exit()
call lying around, causing SCons never to build anything :)
2006-02-05 00:53:47 +00:00
Nathan Letwory
a0db61bca7 * Added safeguards around a few list.remove(x) calls, to prevent SCons
from barfing if a CVS directory was not found (ie when cvs export
  was used).
2006-02-05 00:23:43 +00:00
Nathan Letwory
0884402f2b ==SCons==
* 'scons blendernogame'
  This target will disable the building of the game engine
2006-02-04 15:10:59 +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
Jean-Luc Peurière
b9ce28fc37 revert to sane defaults in sconstruct for darwin
game engine and openal were disabled
2006-01-30 00:45:44 +00:00
Tom Musgrove
130c1dcb31 ==SConscript fix for cygwin==
cygwin build environ was missing the path for libtiff
2006-01-29 22:58:58 +00:00
Nathan Letwory
35a103c403 Stupid old SConstruct made adding openexr more difficult than it should be.
Now OSX will always do openexr. Rewrite will address this bad implementation
once and for all.
2006-01-10 12:27:35 +00:00
Matt Ebb
c8c8edb527 Updated paths on mac os x to be like makefiles (/usr/local/ ... ). Remember to delete config.opts for it to be recreated with the new EXR options! 2006-01-09 12:26:14 +00:00
Kent Mein
c693e01b8d Ton forgot a few modifications to the Scons and Makefile build systems.
These should make it so that other people can compile with OpenEXR support.

(I also added the OPENAL fix erwin commited to bf-blender since I
need it for my machine, and this syncs up the file)

Kent
2006-01-09 02:18:11 +00:00
Johnny Matthews
936ed99cc6 Adding libtiff for win32 build 2005-11-23 14:53:51 +00:00
Toni Alatalo
590e1c1e4a uh should have read the patch better, i did test it and it works :) 2005-11-23 14:31:47 +00:00
Toni Alatalo
d40b4dbaf8 adding libtiff info to scons, applying http://vidar.gimp.org/tmp/scons-linux.diff 2005-11-23 14:28:40 +00:00
Matt Ebb
6d8a7d7819 * Attempting to fix scons for mac os x. It seems to be correct, if I've made a
mistake, someone can please help fix, just trying to get things to compile here
in the studio. You'll need to delete config.opts
2005-11-23 13:44:58 +00:00
Erwin Coumans
0dde486eea applied patch [ #3260 ] Enable compile bullet and sumo with scons 2005-10-28 04:48:01 +00:00
Erwin Coumans
745fc2f9d0 updated SConstruct and Makefile so that if you compile the gameengine, is always enables bullet, independent of sumo/ode.
So for the 2.4 release, both bullet AND sumo will be enabled. You can choose in the world buttons which physics engine is active for a scene.

sorry if this breaks your builds!
2005-10-23 17:55:19 +00:00
D.J. Capelis
edad7a67b4 Build system - Bug Fix/Cleanup: Moving use_fluidsim variable to platform specific section where it belongs as per ML and IRC discussion. This allows platform maintainers some flexibility in determining what should be compiling on each system. Right now fluidsim is set as true everywhere and there is no functional change from before. 2005-10-12 11:55:56 +00:00
Ton Roosendaal
bcbaffc8c2 Look, in one commit!
- test build alpha splash
- version update to 239 in code
- release names are 2.40-alpha1

Note about release names; this is really an alpha still, not a release
candidate, so cannot call it 2.40-pre either.
Naming conventions is a discussion still... hope this works as a compromise
for now.
2005-10-11 14:04:57 +00:00
Nils Thuerey
328eeaf10b - added option to switch off compiling elbeem to scons files (set USE_FLUIDSIM=true)
in this case only the new blenderdummy.cpp and utilities.cpp have to be compiled
- restructured gui:
   * domain options split up into 2 sections
	 * added compressibility and refinement settings
	 * added inflow/outflow object types
- increased progress bar by 1
2005-10-10 06:59:47 +00:00
Jens Ole Wund
b9e6e0c2ec make compiling with free ms vc7 toolkit easier
hum .. do we need that ODBC .. looks like no
2005-10-08 22:40:58 +00:00
Jean-Luc Peurière
0006f8ad14 update to xcode
added a workaround for scons
2005-08-12 21:41:22 +00:00
Jean-Luc Peurière
b12f801681 updates to the OS X build system :
- XCode project
- Scons :
    scons stopped working for Os X in the last month (dont know when) :

     * the '.' and '..' keywords in CCPPATH
          are not recognized anymore for sconscripts compiling files at
          a sub level
     * when doing a scons clean, the 3 subdirs in build dir are removed
      and scons then fail to recreate them (exten, intern, source)

this commit solve the first problem as a temp workaround
for the latter simply recreate the dirs manually

I will investigate that further when on vacations,  which i should already
 be.
 ;(

all 3 build systems are now working on Os X
2005-08-04 16:05:28 +00:00
Simon Clitherow
671235b69b Finalised support for compiling BULLET on linux.
Bullet is now off by default on all platforms until we get an OK
from Erwin. To enable it, change USE_PHYSICS to 'bullet' in your
config.opts.
2005-08-02 18:54:11 +00:00
D.J. Capelis
fc5eca101b Modifications for bullet were made and variables were defined only for windows. This commit defines these variables for the other blender platforms helping SCons not to barf quite as quickly. Scons is still unable to compile a fresh CVS checkout at the present time on linux, but now at least allows config.opts to be properly created.
The new defines for use_bullet are currently set as false until testing can take place to ensure proper compilation on those systems.  The existing use_bullet='true' on the windows platform was left untouched.

Please ensure that variables are defined on _all_ platforms in the future instead of just defining them for the system you're currently developing under.
2005-08-02 12:40:52 +00:00
Simon Clitherow
208da2a5d0 Added support for compiling BULLET with scons on windows
using bandoler's patch as a basis (thanks!).

A couple of notes:

-  This is for windows only, I did not have a chance to try linux yet.

-  SConscript for PHY_Bullet may need tweaking (plus support
 for other platforms), but at least it's in there :)

Any problems, shout :)
2005-08-01 21:19:41 +00:00
Johnny Matthews
aa3a45ddfc Linking to wrong zlib library. fixed! 2005-07-28 18:50:39 +00:00
Johnny Matthews
0f3303b7c5 Fix for zlib with MSVC/SCONS. Should compile now. This does not fix the bullet issues yet. But with this Blender should compile without the gameengine. 2005-07-28 18:11:10 +00:00