b434e7f933
LCMS code removed, was an experiment but never finished.
2011-05-16 13:34:42 +00:00
5cfc13a11d
fixed incorrect jemalloc library & updated netbeans project to ignore __pycache__.
2011-05-16 10:34:40 +00:00
9b236a7a12
SVN maintenance.
2011-05-16 06:11:14 +00:00
0460a68ae7
made generic module for generating project files from cmake,
...
added netbeans project file generator.
2011-05-16 04:04:06 +00:00
6786f92fe5
Use jemalloc in buildbot for linux targets
2011-05-13 12:57:54 +00:00
8941cc626a
Option to use jemalloc when building with scons under linux.
...
Disabled by default.
2011-05-13 12:08:34 +00:00
424a0cca27
option to link with jemalloc on *nix, off by default.
2011-05-12 11:16:32 +00:00
2e3538cf24
patch from Dan Eicher for cpack rpms
2011-05-10 21:59:11 +00:00
770119d16f
patch from Dan Eicher, CPack/RPM working again
2011-05-06 23:59:15 +00:00
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
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
2938695b17
remove dos/unix conversion scripts, enough editors and utilities can do this.
...
update debian spec for new icon location.
2011-05-02 15:56:52 +00:00
088899236b
=trunk=
...
Recommitted eltopo collision code (but disabled by default)
with Genscher's permission.
To use, you need to install liblapack and libblas
2011-05-01 21:39:13 +00:00
16bd053555
buildbot: switch to ffmpeg 0.6.3
2011-04-27 12:50:47 +00:00
05c7db95b6
buildbot:
...
Fixed typo for 64bit blenderplayer which caused undefined symbol gzopen64
2011-04-21 19:01:31 +00:00
11caf24c55
buildbot:
...
Use BF_NUMJOBS from user cinfigs rather than passing it as
command line argument.
2011-04-17 06:17:37 +00:00
bf591017b3
buildbot:
...
- use cores+1 threads
- do not clean build directories
- separate build directories for blender and blenderplayer
This should make compilation much faster and buildbot rebuild tag could
happen more often
2011-04-16 21:23:05 +00:00
f0b45cc1fb
- fix for cmake when there is no version character.
...
- link to release docs correctly from the splash page.
2011-04-12 16:20:41 +00:00
a42bf45333
revert Joseph Eagar's eltopo commits r36073, 36075 (& some minor edits)
...
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners.
Its also too close to release to be making these kinds of changes.
commands used:
# reverse merge
svn merge -r36073:36072 .
# for some reason this gave a lot of property changes
svn revert `svn st | grep "^ M" | awk '{print $2}'`
# reverse merging didn't work here, removing while dir.
svn rm extern/eltopo/
# manually fixed conflict in
# ./source/blenderplayer/CMakeLists.txt
#
# also manually removed 2 lines from
# ./CMakeLists.txt
2011-04-12 11:09:10 +00:00
28594bc742
minor pep8 edits, also added 'test_pep8' & 'test_cmake' to the GNUmakefile for convenience.
2011-04-10 10:45:56 +00:00
0a60bc14d6
=cloth collisions=
...
Plugged the eltopo library into the cloth solver.
I was playing with it earlier, and it's so easy to
use I decided to quickly put it in (trunk's) cloth.
See http://www.cs.ubc.ca/labs/imager/tr/2009/eltopo/eltopo.html
. The authors are on the bleeding edge of continuous collision
detection (one of them did ILM's cloth sim).
I
don't really have to time to plug it into softbody, particles,
bullet, fluid, etc, but doing so would be pretty straightforward.
I'll leave that up to someone else.
To use, turn on USE_ELTOPO (in cmake) or WITH_BF_ELTOPO in scons.
2011-04-09 23:19:11 +00:00
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
a0b172215d
Clean up linking flags for win32.
2011-04-08 14:56:31 +00:00
4d2562fb47
Clean up linking flags for win64.
2011-04-08 14:40:43 +00:00
5c7bed92d4
fix for cmake glew includes (tested with mingw), also made qtcreator project generator work with mingw again
2011-04-06 03:02:40 +00:00
d00501dfd0
SVN maintenance.
2011-04-06 00:22:44 +00:00
ca254dd37b
add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their own glew library.
2011-04-05 23:31:01 +00:00
162d02bf50
quiet warning & minor pep8 edits.
2011-04-04 22:42:43 +00:00
6f20760818
buildbot: static zlib linking
...
Force link to zlib for all platforms/tragets to be sure there'll
be no gzopen64 symbol undefined (it was in some dependend library, so
blenderplayer wasn't working in fedora 13 32bit)
2011-04-04 19:39:47 +00:00
744a3b9cb2
fix cmake for when BLENDER_VERSION_CHAR is not set.
2011-04-03 07:48:33 +00:00
21bd7fd8d5
patch [ #26606 ] Debian spec: Bump to Python 3.2
...
also update pacman spec.
2011-04-02 21:51:05 +00:00
90326c4c6e
buildbot:
...
- Remove packed to buildbot_archive.zip archive file to keep scons install
directory as clean as possible (if i understood correct, this file isn't
actually needed in the future, so we could remove it just after packing rather
than cleaning install directory before packing as it's done for cmake)
- No need in scripts installation for linux slaves when preparing archive
2011-04-02 21:11:22 +00:00
7690086d20
pep8 fixes for buildbot
2011-04-02 05:53:42 +00:00
6d4f57bc3a
Oops, i've forgot that archive is preparing by scons, so stripping should
...
happpen before calling scons (hope, binaries wouldn't be overwritten by it)
2011-04-01 21:38:04 +00:00
485229b7db
Initial support of linux 32/64 bit for buildbot:
...
- Use the same config as we're using for release builds
- Added stipping (maybe it should be generalized)
- Not software gl packing, bot would be easy to add
Note, that you should have special environment to create
proper linux builts (which would work for everybody)
2011-04-01 21:22:19 +00:00
c8652b301f
pep8 checker, mostly pedantic style changes but also found an error in mesh_utils.mesh_linked_faces()
2011-04-01 02:41:15 +00:00
5b19ec3559
Apply patch [ #26660 ] Scons build on OSX fails to create Info.plist file fix
...
provided by Mike Sloman
from the patch report:
When building on Mac OSX with SCONS the Info.plist file is zero length and thus OSX cannot identify icons and file type associations.
The problems was in the execution of the "date" command to add times in the modified bundle name strings passed to sed. This failed and thus the info.plist file was overwritten with 0 length file.
2011-03-30 05:44:01 +00:00
e4ef822ecd
build target was changing into wrong directory.
2011-03-29 12:10:41 +00:00
aa2269e065
remove DEBUG flag from OpenNL with cmake, was giving too many prints in the console when unwrapping.
2011-03-29 11:50:37 +00:00
50a06eccff
pep8 cleanup
2011-03-27 05:23:14 +00:00
f08a227f93
include gcc builtin defines in qtcreator project file (__VERSION__, __x86_64__, __linux__ etc)
2011-03-25 12:42:33 +00:00
19819dcbc7
write project files into the build dir.
2011-03-24 10:54:42 +00:00
0c9488b2f3
the script is now creating 2 project files:
...
Blender.creator
Blender_Python.creator
.glsl files have been added to the former
latter contains everything .py
2011-03-24 08:33:42 +00:00
c210b3991a
support for blender as a module on win32.
2011-03-24 00:14:49 +00:00
95173a4ae8
minor changes to master unpack script.
2011-03-23 01:08:10 +00:00
e5eed21a6b
Buildbot master tweaks: use generic builder for scons win32, unpack fixes.
2011-03-22 15:25:18 +00:00
04a63cb393
Buildbot updates: working windows scons build, and run slave_*.py scripts
...
to compile/test/package directly from svn, easier to make changes this way.
2011-03-22 13:05:05 +00:00
e8dc841199
Version and platform name were in wrong order.
2011-03-22 12:54:13 +00:00
d2a721cfd5
Add buildslave target for builder.blender.org integration
2011-03-22 10:26:53 +00:00
a1567aa7c0
Printing error message would fail on exception.
2011-03-22 08:58:49 +00:00
d781ecff75
fix for grease pencil conversion to bezier curve reading past the end of the array.
2011-03-21 23:30:56 +00:00
4bca2e455d
use spaces rather then tabs + minor pep8 edits.
2011-03-21 22:37:08 +00:00
9a75ba4463
Buildbot initial configuration files, for http://builder.blender.org
...
Maintained in svn to make it easier for others to contribute changes,
actually updating builder.blender.org requires manual update on the
server.
2011-03-21 16:46:26 +00:00
f0d7fbc4b7
CMake package_archive target to create a .zip/.tar.bz2 package on mac/unix,
...
to be used by buildbot.
2011-03-21 16:42:21 +00:00
bcee2343ea
Mac OS X cmake changes and bundle fixes
...
For cmake users, you should now use "make install" instead of "make". This was
already changed for Linux and Windows. Same for Xcode, use the install target.
Changes:
* CMake install mechanism, resulting bundle was verified to be indentical here.
* For cmake, include Info.plist in bundle using builtin mechanism for that.
There was some code in packaging.cmake, but it wasn't correct as these
properties need to be set on the executable.
* For scons, fix app bundle version, was still using removed release/VERSION.
* Remove unused blendercreator.app and blenderpublisher.app.
* Fix Info.plist being set as a binary file in svn, should be plain text.
2011-03-16 15:44:17 +00:00
82783cd0cd
pep8 edits and remove commented code from last commit.
2011-03-14 23:17:52 +00:00
f4e16def46
Build system
...
------------
Allow BF_PYTHON_ABI_FLAGS to be specified on the command line for scons.
2011-03-14 16:10:35 +00:00
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
60fe23b100
cmake, search $HOME/py32 for python now too.
2011-03-12 04:39:43 +00:00
42e9796c04
builder reports MSVC was setting stack size to 2gig.
2011-03-12 04:31:28 +00:00
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
a001b3f072
set 2mb stack for mingw too.
2011-03-12 00:50:34 +00:00
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
f3a455fd22
CMake should find python now without manual options being set on linux.
...
cmake on *nix detects python ABI flags for debug and release mode.
searches /usr /usr/local /opt/py32
2011-03-10 00:25:35 +00:00
1eb57bcbc7
disable openexr and collada for mingw, give linking errors.
2011-03-08 23:12:45 +00:00
e7bf671e25
se BLI_snprintf() for msvc compat, cleanup CMake file, some bad comments left in.
...
also on only try build RPM's on linux.
2011-03-07 03:57:04 +00:00
a803fb095c
update 'make' GNUmakefile stub to run 'make install'
...
update packman and debian for to disable portable install option.
2011-03-06 12:04:59 +00:00
a9f08f6310
use tar.gz for windows python zipfiles rather then .zip,
...
since cmake can only extract tar's
2011-03-06 11:18:57 +00:00
98d444109e
change mingw-scons to use python 3.2
2011-03-04 10:19:02 +00:00
a97f920e2f
Bump OSX SCons to use Python 3.2. Remember to update your lib/darwin* directory.
2011-03-04 09:08:47 +00:00
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
3326c0ca75
fix for invalid empty string check in uniquename callback.
2011-03-03 17:23:59 +00:00
caf84b49f6
patch [ #26235 ] debian/watch: Update for change of versioning
2011-03-03 16:12:32 +00:00
aec6020376
added support for windows/mingw
2011-03-03 15:38:29 +00:00
e8c322ee85
Py/RNA API: WITH_PYTHON_SAFETY
...
compile time option which enables extra safety checks.
since this is noticeably slower I rather not enable by default yet.
2011-03-03 12:00:35 +00:00
c7dc8ddf7d
fix error in qtcreator project file arg checking and check for cmake files.
2011-03-03 11:22:54 +00:00
fa42cf671a
git users complain this breaks for them
2011-02-28 19:48:56 +00:00
9234cb6e30
Make sure python.zip is extracted only once. This prevents erroring build on the unzip stage.
2011-02-28 13:18:00 +00:00
5ef65a0a3b
build system now exclude config-*, turtledemo when copying system python.
...
also remove __pycache__ dirs when cleaning (new in python 3.2)
2011-02-28 05:59:44 +00:00
f73c993b16
- use Py_CLEAR for python internally referencing other PyObjects (supposed to be safer).
...
- detect includes for qtcreator projects as well as the ones from cmake (it didnt return all of the right paths).
2011-02-27 04:01:58 +00:00
61235fcc8a
fix for 'live edit', running python scripts as you type
...
- errors would jump to the line which gets in the way.
- the window wouldn't always redraw.
2011-02-26 15:30:38 +00:00
34abccc0ab
qtcreator project generator now includes defines and correct include paths.
2011-02-26 11:18:36 +00:00
6a25ecb799
recent changes to svn broke rpm builder, also include rpm version info
2011-02-26 06:27:54 +00:00
bc15e0e295
add NDEBUG to scons release flags + some pep8 cleanup for examples.
2011-02-25 16:19:50 +00:00
f2ab4dd6a7
use flag _DEBUG, not DEBUG.
2011-02-25 15:46:43 +00:00
e06eea4fba
fix for scons with recent change to how BINRELOC is enabled via cmake.
...
also add WITH_PYTHON define to qtcreator project generator until we get a way to add them properly.
2011-02-25 14:45:45 +00:00
5005853d40
Fix buildinfo, as pointed by IRIE Shinsuke.
...
Added a note about doubtful "copy if different".
2011-02-25 06:03:01 +00:00
aa9c91f01a
Make buildinfo not fail with git-svn as suggested by Nicholas Bishop.
...
Improve formating and comments a bit.
2011-02-25 04:02:58 +00:00
4b4281f2e2
SVN maintenance.
2011-02-25 00:02:08 +00:00
b8e3f4ee30
fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision.
2011-02-24 17:57:35 +00:00
8ce6da76b6
patch [ #26178 ] build_debian.sh: Use BLENDER_VERSION_CHAR
...
from Shinsuke Irie (irie)
also apply to pacman.
2011-02-24 14:03:29 +00:00
eac95abdf2
missing deps for pacman
2011-02-22 12:36:36 +00:00
ef91644d5a
Type in snapshort ;)
2011-02-22 12:25:31 +00:00
12e4c52c5a
cmake was using dna source list with the variable out of scope, possibly causing dependency problems.
2011-02-22 06:23:07 +00:00
44e33571ca
part of a patch from Dan Eicher with some edits.
...
- clean svn string: 35042:35051M -> 35051
- debian and pacman build with threads by default.
2011-02-22 05:49:21 +00:00
b30e59aa71
patch [ #26146 ] debian/rules: Avoid unnecessary downloading
...
--- from the tracker
It's annoying that build_debian.sh downloads the source tree to create tarball every time we build a deb package.
fix_debian_rules_avoid_downloading.patch modifies debian/rules so that the tarball will be created from local repository if possible.
2011-02-21 13:59:42 +00:00
72d5d692ea
better macro for getting the blender version from BKE_blender.h, also re-run CMake if BKE_blender.h changes.
2011-02-21 08:31:00 +00:00
ff84ad3151
fix for cmake with last commit.
2011-02-21 05:28:22 +00:00
848d60caee
Move blender version info into BKE_blender.h so we only have the info in one place and so package building scripts can extract it in a more usable way.
...
this also means we can have a version string like '2.56a-beta' without using buildinfo.
release/VERSION was only used by scons, NSIS installer.
Possibly helps to fix bug [#26062 ] too.
2011-02-21 04:45:47 +00:00
7809d7d0c8
fix [ #26152 ] Blender File for Image too Small
...
disallow 0% rendersize.
also mark new cmake vars as advanced: RPMBUILD, X11_XF86keysym_INCLUDE_PATH
2011-02-21 01:02:30 +00:00
c30149991c
Experimental option to build blender as a python module, rather then blender embedding python.
...
CMake build option WITH_PYTHON_MODULE, will build ./bin/bpy.so
This allows 'bpy' to be imported from python or other applications/IDE's which embed python, eg:
python -c "import bpy ; bpy.ops.render.render(write_still=True)"
This runs in background mode and has similar restrictions to running a script:
blender --background --python test.py
TODO:
- install to site-packages with blender scripts
- add support for imp.reload()
2011-02-20 23:39:29 +00:00
708df39935
Check the os.environ at the start of the build process.
...
Print any variable that contains a value with non-ascii
characters, then abort build.
2011-02-18 09:39:15 +00:00
cf6f6c1c5e
patch [ #26063 ] Fix deb package versioning (Patch for #26062 )
...
from Shinsuke Irie (irie),
also updated pacman
2011-02-17 11:49:54 +00:00
0927ad8f4c
CMake: remove workaround for cmake 2.8.3 problem testing -Werror=strict-prototypes flag (now 2.8.4 is out).
...
This is harmless, CMake 2.8.3 just wont build with -Werror=strict-prototypes which is nice for picky devs.
2011-02-17 11:38:02 +00:00
812f238494
pep8 cleanup and remove unused vars/imports
2011-02-17 04:35:41 +00:00
fee5363912
bugfix [ #26094 ] Going to Bone Roll menu brings up python error
...
also correct for pep8 warnings.
2011-02-16 02:25:03 +00:00
c461a7ea4d
patch from IRIE Shinsuke, use systems openjpeg on *nix.
2011-02-15 19:04:51 +00:00
52c08fa4d3
CPack packaging support from Dan Eicher, tested to build redhat RPM's, a Mac bundle also defined.
2011-02-15 18:33:05 +00:00
a6765280f9
py rna api: turn class.is_register into a class property rather then a class method.
...
eg:
if MySybclass.is_registered:
...
2011-02-14 07:26:07 +00:00
665a0ff789
Revert incorrect fix for 26062 made in svn rev34828.
2011-02-14 06:04:40 +00:00
4ca2905ead
Fix #26062 : build_debian.sh gives unappropriate deb version
...
Added subverison number to debian package version. Quick tests run ok,
but haven't checked if deb version comparation also goes fine.
2011-02-13 19:47:57 +00:00
6554ae1460
SVN maintenance.
2011-02-11 19:36:58 +00:00
875f554cff
patch [ #26030 ] Debian spec fix (Patch for #26028 )
...
from Shinsuke Irie (irie)
2011-02-11 10:29:47 +00:00
a3d142fce0
update pacman spec for newer python and match naming convention to debian spec.
...
also pre-compile python modiles.
2011-02-11 09:28:11 +00:00
0356e3b69f
script to build debian packages directly from svn, using blender version and svn rev for package name.
2011-02-10 07:22:56 +00:00
1eb7d3bd9e
debian package spec [ #26007 ] Debian spec
...
by Dan Eicher (dna)
2011-02-10 06:11:16 +00:00
736a7b7a22
pep8 cleanup
2011-02-04 09:27:25 +00:00
89c617a116
remove nan-makefiles
2011-01-30 15:29:22 +00:00
71cb745941
Commit to cope with API changes in OpenCOLLADA (latest for Windows right now r827).
2011-01-27 19:39:06 +00:00
6a2e5ad599
[ #25815 ] Patch gcc 4.6
...
with minor edits, made sure it works in CMake too.
2011-01-27 00:02:25 +00:00
7a23193811
cmake attempted fix before didnt work (I cant test on OSX), this should fix.
2011-01-26 07:34:17 +00:00
fb08dc11e3
missed this when updating cmake files
2011-01-26 04:48:37 +00:00
1bd0db59f4
use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken.
...
in the case of python this makes it easier to move to find_package(PythonLibs) when 3.x is supported.
2011-01-25 14:43:13 +00:00
da2b490198
cmake maintenance, was missing 2 headers and made some minor improvements to cmake_consistency_check.py.
...
also converted GHOST_SystemWin32.cpp to utf8.
2011-01-25 08:35:10 +00:00
f6d54bd1ee
correction to own cmake error checking script.
2011-01-21 11:52:56 +00:00
730634ca51
Enable sndfile by default on win64
2011-01-05 09:00:28 +00:00
5e382eb8e5
rename blenderlib to blender_add_lib
2010-12-22 23:09:30 +00:00
29799bf09c
Compact -I paths in makefiles for more readble files/output.
...
Also some white space cleaning and removal of redundant parameter.
2010-12-22 22:15:20 +00:00
7006491451
bugfix [ #24469 ] Cannot add keyframes on custom properties in IDPropertyGroups
2010-12-21 11:40:12 +00:00
9d289c602d
better make_quiet.sh filter with threaded builds.
2010-12-21 04:55:46 +00:00
0d9ead00f8
fix for cmake flag detection, was not caching the resulting variable so the test ran each time.
...
also cache SSE, SSE2 checks.
2010-12-21 03:32:51 +00:00
71202e26ff
simple make wrapper to give quiet output. (more like nan-makefiles)
2010-12-20 11:21:29 +00:00
6afe713d57
script to generate qtcreator project files, advantage is they include all source which is nicer for refactoring.
2010-12-16 21:32:56 +00:00
b978bf39e3
fix for error in testing C/C++ flags
2010-12-16 17:54:00 +00:00
566bda734a
last commit to fix warnings didnt set them at all, not it works as it should.
...
also made cmakes output a lot quieter, messages can be uncommented for debugging or added back if other devs need this for some reason.
2010-12-16 12:48:30 +00:00
ed4e7271f1
CMake now tests warnings are supported, GCC 4.0 wasn't working because of unsupported warnings.
...
this can work for other compilers too, currently intel and gcc use this.
2010-12-16 09:55:35 +00:00
acd7b81c2d
bugfix [ #25230 ] Quick extrude Ctrl-LMB : wrong behaviour of 'RotateSource' option.
...
Problem is is with operator redo which click-extrude exposed.
Check if redo operator can run, otherwise lock the UI and add a label that the operator doesn't support redo.
This is clunky but IMHO better then failing silently and leaving the user confused.
- Merged redo functions into ED_undo_operator_repeat(), code was duplicated in a few places.
- added WM_operator_repeat_check to check if WM_operator_repeat() can run, avoids an undo call when redo work.
Unrelated changes
- GHOST_SystemWin32.cpp set to utf8 encoding.
- cmake_consistency_check.py now checks source files are utf8.
2010-12-15 04:06:19 +00:00
996bc87793
update for changes in cmake files.
2010-12-14 08:35:56 +00:00
afacd18498
use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
2010-12-08 08:43:06 +00:00
c5613de2d5
Remove redundant VC_REDIST code, since it's not used anymore.
2010-12-07 08:37:00 +00:00
d64f46e0bb
CMake: use a global list to store libraries built rather then cmake_blender_libs.txt file.
2010-12-06 10:56:37 +00:00
263830f000
Enabled GCC -Wwrite-strings warning for CMake and replaced many 'char's for 'const char's,.
...
Only one functional change where Transform orientations passed "" to BIF_createTransformOrientation() which could then have the value written into.
2010-12-03 17:05:21 +00:00
cd97253502
- added GCC warning -Wstrict-prototypes
...
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
2010-12-03 12:30:59 +00:00
3e173f4d21
disable redcode support for cmake & scons-freebsd
2010-12-01 07:25:59 +00:00
42d6603cae
Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options.
2010-11-30 18:52:39 +00:00
7286b7a7ca
SVN maintenance.
2010-11-29 17:09:33 +00:00
e8397e6193
include headers in cmake source, added a script to check for consistency, reporting missing headers & C files.
...
this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.
2010-11-29 04:35:56 +00:00
94e17ff01e
fix for cmake if build flags are not defined.
2010-11-22 23:06:57 +00:00
c85c2746df
WITH_SAMPLERATE option for cmake, without this playback wont behave right so this is mainly intended for developers who build without audio enabled.
2010-11-21 14:32:55 +00:00
39b7bfe6bd
- check IF WIN32 AND NOT UNIX (for cygwin)
...
- patch from Mike S to enable OpenMP and xcode
2010-11-21 13:41:43 +00:00
741d5a6c06
fix for CMake file grouping with MSVC project files.
2010-11-08 06:31:45 +00:00
36b8ebceb5
added back include file globbing for cmake, thought this was needed for MSVC only but turns out QtCreator also needs this else it wont index headers.
2010-11-05 04:18:53 +00:00
228ed6f086
Global definition of _LARGEFILE_SOURCE, _FILE_OFFSET_BITS and _LARGEFILE64_SOURCE at linux and win32/mingw platforms
...
Needed to work properly with large files at 32bit system (display correct size in file browser, i.e.)
This will also fix compilation with zlib 1.2.5
2010-11-04 17:02:25 +00:00
2cef9203ba
Add PREFIX support to makefiles.
2010-11-01 23:17:58 +00:00
0876fce009
rename and negate DISABLE_PYTHON --> WITH_PYTHON
2010-10-31 04:11:39 +00:00
50dab4fc37
rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE
2010-10-31 03:20:33 +00:00
f875777212
Change /WX away for now, some odd thing going on between cloned environments. Need to check after release.
2010-10-26 23:32:59 +00:00
c7ff23cc34
Added CMake macro REMOVE_STRICT_FLAGS(), this means developers can build with -Werror in their CMAKE_C_FLAGS_DEBUG (so all warnings give errors).
...
but external libs which we don't maintain & generated code will have -Werror removed.
This is GCC only, MSVC can be added easily.
2010-10-24 03:57:07 +00:00
f4415ce84a
- CMake now only uses SOURCE_GROUP with MSVC lib configuration, saves recursive header search when not using msvc.
...
- uv layout export wasn't setting the default filename.
2010-10-23 04:18:53 +00:00
db74070778
Make C4013 throw a warning
...
-> 'function' undefined; assuming extern returning int
2010-10-19 05:42:31 +00:00
62aacd1aa7
Set defaults for compile and link flags to lists.
2010-10-19 05:21:28 +00:00
2a89fb887e
* Enable compile and link flags to build info also on Windows and in SCons.
...
* Added build_system SCons or CMake
* Write the new build info also to system-info.txt
2010-10-19 05:00:36 +00:00
3498e22468
Disable LCMS by default for scons.
2010-10-19 02:50:00 +00:00
6e77dc1942
whitespace commit, AKA commit count bump.
2010-10-18 20:33:04 +00:00
58683fa993
enable DEBUG define in CMake and scons, also change booleans debug option to BOP_DEBUG, which was used inconsistently, and had to add a define for superlu.
2010-10-18 11:21:22 +00:00
952b728578
Test stricter GCC compiler settings, these warnings will now give errors.
...
- implicit function declaration.
- no return type set for a function.
- declaration after statement.
This may be too strict but in general I prefer we don't allow commits with these warnings.
Applies to cmake/gcc and scons/linux.
2010-10-17 08:04:28 +00:00
f0fcf140f8
enable warning for unused args with gcc: -Wunused-parameter
...
- for cmake only apply this to source/blender, will apply globally later.
- ./extern/ ./source/blender/makesrna/intern/ ignore this.
2010-10-15 02:24:48 +00:00
663ce490e0
Enable CXX_GUARDEDALLOC support through SCons.
2010-10-08 20:39:56 +00:00
5bab95fc58
Scons options for static linking to libsamplerate, sndfile and fftw3
2010-10-05 16:43:01 +00:00
31ff2a6da2
Enable lcms support on Windows.
2010-10-05 13:39:45 +00:00
c5086987ec
fix for scons with recent buildinfo change
2010-10-03 11:33:44 +00:00
4418396a45
Change <UNKNOWN> to -UNKNOWN- so exporters can be happy too, when a build was created without svnversion (or from export).
2010-10-01 08:29:27 +00:00
d0451fea58
Changes to scons for building with static zlib and tiff libraries.
2010-09-21 21:10:49 +00:00
6963574a55
scons now gets the blender version from BKE_blender.h.
2010-09-18 10:37:51 +00:00
4bba0e3397
spec files for building arch linux packages (pacman)
2010-09-12 16:00:12 +00:00
40bf22e955
Part 4 of 2.54 beta commits (last)
2010-09-10 16:39:08 +00:00
115b256738
ran through pep8 checker
2010-09-07 15:17:42 +00:00
88f657f251
scons compiling fix:
...
When "svnversion" can't be found (as is usual for anyone running TortoiseSVN), build_revision info will be "", which breaks compiling. Worked around this for now by using "<UNKNOWN>" as this
2010-08-30 00:49:23 +00:00
cb786f0022
Remove unnecessary \''s. This cleans up also printouts in splash and bpy.app (no more unnecessary quotes).
2010-08-29 21:53:12 +00:00
c29b5df739
Changing representation, so there's no space between the words.
2010-08-29 21:49:50 +00:00
6c113b54b3
Finally change SConscript tabs to spaces.
2010-08-29 20:52:05 +00:00
999bb69c70
Properly set build type: Release or Debug
2010-08-29 19:47:26 +00:00
57aee2ecf4
Tell what platform and its bitness in BUILD_PLATFORM
2010-08-29 19:44:50 +00:00
cc70bffb62
Make sure correct python31 zip is unpacked when BF_DEBUG=True
2010-08-27 21:42:33 +00:00
f647ba1ce5
Patch [ #5429 ] SCons patch for linux: support more libs to be linked statically
...
Contributed by Rui Campos, adapted for current trunk
This was a very ancient patch on my todo list (mid-December 2006). Some things already were done, so I
added now ffmpeg and freetype support for linking statically. FFMPEG part is untested further from my part
so if you run into problems with that, please report.
2010-08-26 08:04:58 +00:00
92422ba452
Patch [ #23389 ] Add authorship information to exported COLLADA files
...
Contributed by Imran Syed (freakabcd).
This adds basic authoring tool and author info ("Blender User" for now).
NOTE: Linux and OSX users need now to update their OpenCOLLADA libs - Blender should now compile fine with their latest revision.
Made some changes to the original patch to ensure linking is done correctly.
Some small cleanups for scons too.
2010-08-26 06:58:32 +00:00
141da38088
patch [ #23359 ] Addenda: fixes for SCons FreeBSD 7, 8, 9 support
...
from Jashank Jeremy (jashank)
2010-08-25 14:33:50 +00:00
446122d112
== SCons ==
...
Make it possible to link statically against libgettext. Set WITH_BF_GETTEXT_STATIC to True and put static lib in BF_GETTEXT_LIB_STATIC (absolute path works probably best). BF_GETTEXT_LIB will be ignored.
2010-08-24 13:08:14 +00:00
70e99a3476
make quicky wrapper for cmake.
...
works like scons where using a subset of the targets name is enough.
make_quicky.py py
...expands into
make bf_python bf_python_ext blender/fast
arguments like -j4 are passed on.
2010-08-24 05:24:37 +00:00
801ba2e345
Apply patch #23295 - Fix for SCons building on FreeBSD
...
Patch submitted by Jashank Jeremy. This adds support for freebsd7, freebsd8 and freebsd9. Thanks!
2010-08-13 20:54:34 +00:00
2a72eb8c28
Fixing make files compilation in linux
2010-08-11 14:51:52 +00:00
e588e8e741
bugfix [ #23257 ] cmake tests for SSE, but SSE2 gets enabled
...
patch from Vinay Pawar, some minor changes by me.
2010-08-11 08:23:48 +00:00
5d18274cac
Makefile fix: on PowerPC architecture SSE compile should not happen.
...
Note for the coder here, is it correct to enable SSE with a general
WITH_BF_RAYOPTIMIZATION flag? Just call it WITH_SSE? More clear :)
2010-08-05 14:04:56 +00:00
2f8f86e4f6
fix path to release/python.zip for scons and cmake
...
I hope this doesn't break anything
2010-08-04 11:07:14 +00:00
d50cc7826f
== Makefiles ==
...
* add support for LCMS (disabled by default, set WITH_LCMS to true to enable it)
* fixed typo that prevented TIFF support to be properly enabled
* enable ray optimization by default (scons and cmake already did this)
* fixed building with libsndfile on darwin (disabled by default)
* quicktime: use audaspace headers from $(NAN_AUDASPACE)/include instead of intern
* gameengine: add -DWITH_FFMPEG to compiler flags when building with ffmpeg support
2010-08-04 08:42:18 +00:00
957976882d
build options to disable image formats WITH_CINEON, WITH_HDR.
...
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
2010-08-03 11:25:34 +00:00
ec2c52c9c8
SCons
...
- remove scons option WITH_BF_FHS, its not needed anymore.
- comment WITH_BF_DOCS, was using epydocs which we dont use now.
- blenderlite target was broken, always using openmp.
- building without python wasnt working.
- fixed some warnings.
2010-08-02 16:27:41 +00:00
7bd687ea58
cmake
...
- more strict warnings for gcc/unix, still <50 for a clean build.
- install files to /usr/local/share/blender/2.53 rather then /usr/local/share/blender/.blender
2010-08-02 16:23:58 +00:00
3e387b8c42
* for win64 fftw3 support is already enabled by default, doing so also for win32.
2010-07-28 17:08:24 +00:00
bed40ed8e3
move directories:
...
dlltool --> build_files/make/dlltool
bin --> release/bin
Since dlltool is only used make + mingw and ./bin is misleading because it would seem the blender binary would be copied there, but its just used for home directory files.
updated scons/cmake/make
2010-07-26 11:47:33 +00:00
75913ce446
2.5 Beta version files increment, from 2.52 to 2.53.
2010-07-20 16:44:59 +00:00
1f8f55b3cd
- Reverted "Set FREE_WINDOWS when compiling with MinGW"
...
- Reverted own changes made to _stat function BLI_exists
- Use __MINGW32__ instead of FREE_WINDOWS in BLI_exists
- Removed recently added lib dependencies for mingw
2010-07-19 09:19:54 +00:00
266438b5e0
- Use correct paths for mstoolkit and crossmingw tools in sconscript
...
- Use _stat64i32 instead of _stat in BLI_exist
Needed for correct compilation by mingw, no sense for msvc
(_stat is equivalent to _stat64i32 in Visual C++ 2005, and later i suppose)
- Added library msvcr90 for mingw to solve linking error to _stat64i32
2010-07-19 09:02:27 +00:00
2f96ac8b9f
SVN maintenance.
2010-07-15 20:30:31 +00:00
7fc9eee08a
- updated man page from --help output.
...
- cmake now installs the man page.
- added cmake_linux_install.sh, shell script which downloads and builds blender.
2010-07-15 19:58:23 +00:00
1bb789956d
CMake patch from Ralf Hölzemer (cheleb)
...
[#22849 ] Fix cmake install target on linux
--- from the tracker ---
This patch fixes the install target for the linux platform. Since the new configuration path changes are in effect, files have to be installed in the correct places instead of just copying the local installation to $PREFIX/share/blender.
It also provides a new macro to determine the correct blender version values.
Changes in this patch include:
- the .desktop menu file is installed in $PREFIX/share/applications and points to the svg icon instead of a png one, which is also installed in $PREFIX/share/pixmaps
- docs are installed in $PREFIX/share/doc/blender
- scripts are installed in in $PREFIX/share/blender/x.xx/
- locales are installed in in $PREFIX/share/blender/x.xx/datafiles
- a new cmake macro determines and sets the correct values for BLENDER_VERSION_MAJOR, BLENDER_VERSION_MINOR, BLENDER_SUBVERSION, BLENDER_VERSION, BLENDER_MINVERSION_MAJOR, BLENDER_MINVERSION_MINOR, BLENDER_MINSUBVERSION and BLENDER_MINVERSION by parsing source/blender/blenkernel/BKE_blender.h and calculating major/minor values. This replaces the hardcoded value in the top CMakeLists file and is used by all platforms.
2010-07-14 20:26:46 +00:00
a6a646cf5b
Scons/darwin (OSX): blender.app package is now created correctly in the install folder
2010-07-14 18:19:34 +00:00
bfe11037b5
move nan mk files from source/ into build_files/make/
2010-07-13 00:57:19 +00:00
d80d6e2812
re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config
2010-07-12 18:26:35 +00:00
Brecht Van Lommel
Campbell Barton
Guillermo S. Romero
Sergey Sharybin
Joseph Eagar
Nathan Letwory
M.G. Kishalmi
Ken Hughes
Ervin Weber
Ton Roosendaal
Joshua Leung
Joilnen Leite
Stefan Gartner
Damien Plisson