Joseph Eagar
f01261d040
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
Campbell Barton
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
Guillermo S. Romero
5005853d40
Fix buildinfo, as pointed by IRIE Shinsuke.
...
Added a note about doubtful "copy if different".
2011-02-25 06:03:01 +00:00
Guillermo S. Romero
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
Guillermo S. Romero
4b4281f2e2
SVN maintenance.
2011-02-25 00:02:08 +00:00
Campbell Barton
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
Campbell Barton
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
Campbell Barton
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
Campbell Barton
ff84ad3151
fix for cmake with last commit.
2011-02-21 05:28:22 +00:00
Campbell Barton
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
Campbell Barton
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
Campbell Barton
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
Campbell Barton
812f238494
pep8 cleanup and remove unused vars/imports
2011-02-17 04:35:41 +00:00
Campbell Barton
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
Campbell Barton
c461a7ea4d
patch from IRIE Shinsuke, use systems openjpeg on *nix.
2011-02-15 19:04:51 +00:00
Campbell Barton
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
Campbell Barton
736a7b7a22
pep8 cleanup
2011-02-04 09:27:25 +00:00
Campbell Barton
7a23193811
cmake attempted fix before didnt work (I cant test on OSX), this should fix.
2011-01-26 07:34:17 +00:00
Campbell Barton
fb08dc11e3
missed this when updating cmake files
2011-01-26 04:48:37 +00:00
Campbell Barton
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
Campbell Barton
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
Campbell Barton
f6d54bd1ee
correction to own cmake error checking script.
2011-01-21 11:52:56 +00:00
Campbell Barton
5e382eb8e5
rename blenderlib to blender_add_lib
2010-12-22 23:09:30 +00:00
Guillermo S. Romero
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
Campbell Barton
7006491451
bugfix [ #24469 ] Cannot add keyframes on custom properties in IDPropertyGroups
2010-12-21 11:40:12 +00:00
Campbell Barton
9d289c602d
better make_quiet.sh filter with threaded builds.
2010-12-21 04:55:46 +00:00
Campbell Barton
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
Campbell Barton
71202e26ff
simple make wrapper to give quiet output. (more like nan-makefiles)
2010-12-20 11:21:29 +00:00
Campbell Barton
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
Campbell Barton
b978bf39e3
fix for error in testing C/C++ flags
2010-12-16 17:54:00 +00:00
Campbell Barton
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
Campbell Barton
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
Campbell Barton
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
Campbell Barton
996bc87793
update for changes in cmake files.
2010-12-14 08:35:56 +00:00
Campbell Barton
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
Campbell Barton
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
Campbell Barton
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
Campbell Barton
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
Campbell Barton
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
Guillermo S. Romero
7286b7a7ca
SVN maintenance.
2010-11-29 17:09:33 +00:00
Campbell Barton
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
Campbell Barton
94e17ff01e
fix for cmake if build flags are not defined.
2010-11-22 23:06:57 +00:00
Campbell Barton
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
Campbell Barton
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
Campbell Barton
741d5a6c06
fix for CMake file grouping with MSVC project files.
2010-11-08 06:31:45 +00:00
Campbell Barton
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
Campbell Barton
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
Campbell Barton
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
Nathan Letwory
31ff2a6da2
Enable lcms support on Windows.
2010-10-05 13:39:45 +00:00
Campbell Barton
115b256738
ran through pep8 checker
2010-09-07 15:17:42 +00:00