Commit Graph

75 Commits

Author SHA1 Message Date
Jens Verwiebe
5e8d191930 OSX/scons: fix compile with static python, my patch was a bit outdates, sorry 2011-08-31 14:15:14 +00:00
Jens Verwiebe
2457c2134a OSX: additionally choice to link against python-framework again 2011-08-30 23:52:12 +00:00
Nathan Letwory
24ea5fe424 Enable libsndfile by default on win32 too. 2011-08-30 12:40:15 +00:00
Jens Verwiebe
3b1192431f OSX/scons: don´t link to system stubs with 10.7 sdk 2011-08-25 09:41:36 +00:00
Sergey Sharybin
0e3b8ff6a5 Update rules for linux cross and mingw: list of DLLs for FFmpeg should be defined there. 2011-08-22 19:27:54 +00:00
Sergey Sharybin
a33a26ca07 FFmpeg library update:
- Update scons/cmake rules to use new versions of libs/dlls.
- Update rules for buildbot.
2011-08-22 18:49:42 +00:00
Sergey Sharybin
36f20f162c Fix #28154: linux3-config.py doesn't exist
Change OURPLATFORM from "linux<major_version>" to simple "linux".
Since new policy for linux kernel versions that major version in
platform doesn't make much sense for building rules so the same
rules could be used for both of linux2 and linux3 now/

Tested on both of linux2 and linux3 systems.
2011-08-21 13:31:46 +00:00
Sergey Sharybin
c9216e390c Commiting patch from jensverwiebe for NDOF support on OSX 2011-08-11 15:59:19 +00:00
Thomas Dinges
fad243a4bf Mac Compile fix for ndof, by jensverwiebe. Thanks! 2011-08-07 22:48:04 +00:00
Campbell Barton
577293569a scons patch from jensverwiebe
fix a silly bug in version detection, - added an OSX sdk-check

jensverwiebe, needs to get commit access!, but will apply his patches for now.
2011-08-07 16:54:40 +00:00
Mike Erwin
6a0bbfd0e4 fixed ndof library detect for Mac SCons, ndof enabled by default (disabled if lib not found), minor cleanup 2011-08-07 16:29:05 +00:00
Mike Erwin
6c821f4078 stricter NDOF guards for Windows (forgot in earlier commit) 2011-08-06 23:13:36 +00:00
Kent Mein
7368298a45 Messed up char was causing problems on windows even though it was in the
comments.

Kent
2011-08-05 19:55:36 +00:00
Campbell Barton
a6b677c81d patch from jensverwiebe to scons to be compatible with gcc llvm. people who copy the darwin-config.py to their user-config.py should update. 2011-08-05 12:07:05 +00:00
Nathan Letwory
d795a78cb7 Default to False for WITH_BF_3DMOUSE, since needs separate package installed. 2011-08-03 14:04:48 +00:00
Sergey Sharybin
2c4357c1e1 - Move list of FFmpeg DLLs to be installed from SConstruct
to conficuration variable BF_FFMPEG_DDL.
  This would allow to use different FFmpeg in buildbot.
- Added some 3DMOUSE variables to list of command line options.
  Now 3dmouse related-settings can be set from command line.
2011-08-03 10:50:21 +00:00
Sergey Sharybin
13eefec9dd More flexible configuration for 3dmouse library for scons.
Needed for release environment and buildbot.

Buildbot rules would be updated with next commit after
environment will be tested.
2011-08-02 17:59:43 +00:00
Nathan Letwory
9e0113890e 3D Mouse support on for windows/msvc by default. 2011-08-02 09:06:55 +00:00
Mike Erwin
56918978b7 3D mouse support from merwin-spacenav branch 2011-08-02 04:28:05 +00:00
Nathan Letwory
eea7c358c7 svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-21 09:40:59 +00:00
Campbell Barton
415761d508 own change to cmake files broke MSVC2010 with Debug configuration, reported by Alex K 2011-07-01 03:40:12 +00:00
Mike Erwin
bca3da4fb0 updated build script for SpaceNav on Linux -- was foolishly relying on user-config.py 2011-06-28 21:20:47 +00:00
Mike Erwin
446be52164 made Pascal string less intrusive to build systems 2011-06-28 15:57:39 +00:00
Nathan Letwory
fdbae99668 Explicitly turn off JACK so it's clear it's not supported. 2011-06-28 06:56:39 +00:00
Campbell Barton
c0a83d24e9 cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for debug 2011-06-28 02:49:49 +00:00
Campbell Barton
93bb6238e0 remove some unused flags and correct aud example heading 2011-06-27 07:44:59 +00:00
Campbell Barton
418d2ce49e allow rna to set vertex parent indices, blender checks for invalid values on access.
build blenderplayer by default on linux with scons.
2011-06-21 07:41:49 +00:00
Nathan Letwory
d10b247c78 Set Player building to True by default. 2011-06-20 20:51:12 +00:00
Nathan Letwory
1d3a025e0a Fix [#27666] Python/Windows issue: "import uuid" results in an error popup
submitted by Gaia Clary

Ignore msvc runtime libs while linking. Tested on win64.
2011-06-17 00:30:04 +00:00
Nathan Letwory
1b1fdd7ecf Turn off Quicktime support by default. Will be phased out soon. 2011-06-13 09:33:27 +00:00
Mike Erwin
e75ff53452 migrated NDOF code from soc-2010-merwin, SpaceNavigator now works on Mac blender 2011-06-08 21:18:03 +00:00
Nathan Letwory
899f2776db Shuffle some build code around to ensure debug builds on Windows actually run too.
* creator/SConscript is now empty, code is moved to an emitter function in Blender.py
* make sure COLLADA debug libs are used when BF_DEBUG=True
2011-06-08 11:53:07 +00:00
Campbell Barton
7b9eabb6f2 fix from nico_ga on IRC, building on MSVC with jack but not ffmpeg. 2011-06-06 08:40:47 +00:00
Brecht Van Lommel
b434e7f933 LCMS code removed, was an experiment but never finished. 2011-05-16 13:34:42 +00:00
Sergey Sharybin
8941cc626a Option to use jemalloc when building with scons under linux.
Disabled by default.
2011-05-13 12:08:34 +00:00
Brecht Van Lommel
309bb2937d Forgot to mention that for scons, I've disabled install of the texture and
sequence plugins, as was already done for cmake, they don't work in 2.5.

This is a fix for last commit, this file shouldn't have been included.
2011-05-06 20:21:20 +00:00
Brecht Van Lommel
cb12337363 Code cleanup: remove source/kernel module, this wasn't really the kernel of
anything, only contained a hash map and functions to pass command line args
to the game engine. Moved those to container and BlenderRoutines modules.
2011-05-06 20:18:42 +00:00
Campbell Barton
161927e27e remove -mwindows flag for scons/mingw, enable manifest & winblender.rc for all windows builds except for msvc2010 2011-04-09 00:10:29 +00:00
Nathan Letwory
a0b172215d Clean up linking flags for win32. 2011-04-08 14:56:31 +00:00
Nathan Letwory
4d2562fb47 Clean up linking flags for win64. 2011-04-08 14:40:43 +00:00
Sergey Sharybin
cf8cc39d4c Make BF_PYTHON_ABI_FLAGS a scons option. Default flags are empty.
Made changed to linux2-config and freebsd*-config. Windows/MacOS are kept
unchanged.

I'm not sure which flags should be used for freebsd systems, so flags for
them also kept empty. Maintainers of this platform, please check which
flags should be used and make changes to rules.
2011-03-13 09:29:47 +00:00
Campbell Barton
42e9796c04 builder reports MSVC was setting stack size to 2gig. 2011-03-12 04:31:28 +00:00
Campbell Barton
c786a2c805 edit scons to use py3.2 on all os's and use 'm' abiflag on linux since this is the most common. 2011-03-12 01:03:15 +00:00
Campbell Barton
a001b3f072 set 2mb stack for mingw too. 2011-03-12 00:50:34 +00:00
Nathan Letwory
92665b0a51 Fix [#25659] crash when unwrapping specific mesh
Reported by Jan Hohoho

Running the unwrap causes stack to overflow. Double the size from default 1MB.
2011-03-11 23:27:15 +00:00
Campbell Barton
1eb57bcbc7 disable openexr and collada for mingw, give linking errors. 2011-03-08 23:12:45 +00:00
Ervin Weber
98d444109e change mingw-scons to use python 3.2 2011-03-04 10:19:02 +00:00
Nathan Letwory
a97f920e2f Bump OSX SCons to use Python 3.2. Remember to update your lib/darwin* directory. 2011-03-04 09:08:47 +00:00
Nathan Letwory
f7ed83647d Move Windows SCons system to build Blender against the new Python 3.2 libs committed in r35340 and r35341.
Platform maintainers and release builders, please update your systems also to Python 3.2.
2011-03-04 00:59:45 +00:00
Campbell Barton
bc15e0e295 add NDEBUG to scons release flags + some pep8 cleanup for examples. 2011-02-25 16:19:50 +00:00