Thomas Dinges
a645935a1d
Build system fixes:
...
* Fixed Boost libs names after upgrade to 1.47
* Remove old reference to space_sound from cmake.
2011-11-08 20:56:55 +00:00
Nathan Letwory
c9bca51e76
Add compiles support for Cycles.
...
No CUDA compiling yet, will be added later.
2011-11-08 20:40:02 +00:00
Campbell Barton
33814e0093
edits to cycles cmake files so cmake_consistency_check.py can parse them.
2011-11-08 20:27:37 +00:00
Brecht Van Lommel
24aebc444b
Cycles Merge
...
Documentation:
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles
Cycles is available is an extra render engine from the top header. It's not
feature complete, consider this as a first preview release. Known bugs:
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles/KnownIssues
Building currently only works with CMake, SCons support is being worked on
and should be available soon.
Also missing still is precompiled OpenImageIO and Boost for Linux, these will
be added later in lib/linux*, if you do not have these installed on your
system, Cycles will simply not be available.
2011-11-08 17:00:40 +00:00
Campbell Barton
ce462fa1b7
- disable undo for user preferences (every click would do push an undo), was noticeable on large files.
...
- also netbeans project file generator now uses branch name for project.
2011-11-08 15:11:27 +00:00
Brecht Van Lommel
dca15b215d
Cycles: svn merge -r41613:41627 ^/trunk/blender
2011-11-07 17:13:32 +00:00
Campbell Barton
9ced8a23fe
quiet warnings when building without libmv
2011-11-07 16:26:23 +00:00
Brecht Van Lommel
a6828b9c6f
CMake: add delayed_install macro to specify files to be installed from modules
...
other than source/creator.
2011-11-07 15:53:40 +00:00
Brecht Van Lommel
b06db617a0
CMake: Boost and OpenImageIO building support (unused still).
2011-11-07 15:44:09 +00:00
Brecht Van Lommel
5ef9039b7e
Cycles: svn merge -r41531:41613 ^/trunk/blender
2011-11-07 15:23:08 +00:00
Sergey Sharybin
27d42c63d9
Camera tracking integration
...
===========================
Commiting camera tracking integration gsoc project into trunk.
This commit includes:
- Bundled version of libmv library (with some changes against official repo,
re-sync with libmv repo a bit later)
- New datatype ID called MovieClip which is optimized to work with movie
clips (both of movie files and image sequences) and doing camera/motion
tracking operations.
- New editor called Clip Editor which is currently used for motion/tracking
stuff only, but which can be easily extended to work with masks too.
This editor supports:
* Loading movie files/image sequences
* Build proxies with different size for loaded movie clip, also supports
building undistorted proxies to increase speed of playback in
undistorted mode.
* Manual lens distortion mode calibration using grid and grease pencil
* Supervised 2D tracking using two different algorithms KLT and SAD.
* Basic algorithm for feature detection
* Camera motion solving. scene orientation
- New constraints to "link" scene objects with solved motions from clip:
* Follow Track (make object follow 2D motion of track with given name
or parent object to reconstructed 3D position of track)
* Camera Solver to make camera moving in the same way as reconstructed camera
This commit NOT includes changes from tomato branch:
- New nodes (they'll be commited as separated patch)
- Automatic image offset guessing for image input node and image editor
(need to do more tests and gather more feedback)
- Code cleanup in libmv-capi. It's not so critical cleanup, just increasing
readability and understanadability of code. Better to make this chaneg when
Keir will finish his current patch.
More details about this project can be found on this page:
http://wiki.blender.org/index.php/User:Nazg-gul/GSoC-2011
Further development of small features would be done in trunk, bigger/experimental
features would first be implemented in tomato branch.
2011-11-07 12:55:18 +00:00
Brecht Van Lommel
942d2fe3b7
Cycles: svn merge -r41467:41531 ^/trunk/blender
2011-11-04 20:21:40 +00:00
Campbell Barton
209ceb6969
correct some warnings, also sensor_x was being paassed to object_camera_matrix(...) for x and y args, looks like an accident
2011-11-04 15:21:34 +00:00
Thomas Dinges
563becafb9
Scons:
...
* Basic support for OpenImageIO and Boost libraries
* Path to libraries added for win32/64-vc-config.py, still commented out.
2011-11-03 12:40:15 +00:00
Thomas Dinges
6ea6e992ba
Scons:
...
* Minor cleanup
2011-11-03 12:24:29 +00:00
Campbell Barton
b07d92408b
cmake could ignore defines for python lib/include passed from the command line if both weren't defined.
2011-11-02 21:35:00 +00:00
Brecht Van Lommel
2f453773f6
Cycles: svn merge -r41266:41467 ^/trunk/blender
2011-11-02 16:17:05 +00:00
Campbell Barton
d7de4d28dd
quiet some warnings.
2011-11-01 22:51:10 +00:00
Campbell Barton
e4896c999f
name qtcreator projects based on branch names (if svn is found and its a branch), was too confusing with multiple IDE's open calling all projects 'Blender'.
2011-11-01 02:24:40 +00:00
Campbell Barton
a5959e767e
hopefully fix problem with cmake on osx (older gcc version)
2011-11-01 00:34:09 +00:00
Campbell Barton
9c801a6d85
Correction to own commit r41169
2011-10-31 09:52:43 +00:00
Campbell Barton
f708318833
correct flags for older GCC's which dont suppport -Wno-deprecated-declarations,
...
detect if the flag is supported before use
2011-10-30 04:48:00 +00:00
Thomas Dinges
f837b46a2b
Modifier compilation tweaks (Blender conference commit)
...
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake)
* Use WITH_BF_FLUID in your user config (scons)
* Add support for scons to disable build with Decimate and Boolean modifier.
(WITH_BF_DECIMATE and WITH_BF_BOOLEAN)
2011-10-29 23:56:07 +00:00
Campbell Barton
c936c61bac
tweak remove_strict_flags so it can be used with gcc's -Wall
2011-10-27 07:26:41 +00:00
Campbell Barton
7dd63e6c40
update is_c() utility function to include '.cc' and '.inl' files.
2011-10-24 23:29:28 +00:00
Brecht Van Lommel
47463742e2
Cycles: svn merge -r41232:41266 ^/trunk/blender
2011-10-24 22:51:44 +00:00
Brecht Van Lommel
4cd1e6337e
Cycles: svn merge -r41225:41232 ^/trunk/blender
2011-10-24 22:32:00 +00:00
Sergey Sharybin
8afc509be4
Some small fixes and changes:
...
- Add *.cc files to qtcreator project as well as .cpp and .cxx
(would be needed for correct generating projects with libmv library).
- Added negate_v2 and negate_v2_v2 functions. They'll be needed for
camera tracking project.
- Fixed issue with generating proxies from 32bit images.
(generated jpg-s opened fine in blender, but were dark in osx viewer).
- Marked unused arg in indexer as UNUSED.
2011-10-24 17:09:31 +00:00
Campbell Barton
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
Brecht Van Lommel
9adfa289e8
Cycles: svn merge -r41157:41182 ^/trunk/blender
2011-10-21 20:26:54 +00:00
Brecht Van Lommel
10af15b85b
Cycles: svn merge -r40934:41157 ^/trunk/blender
2011-10-21 20:13:12 +00:00
Campbell Barton
5efcf9bd1f
remove scons files for unsupported/obscure unix variants, these configs are not maintained (aix defined FREE_WINDOWS for example and nobody noticed), and CMake builds on OpenBSD/NetBSD with no manual configuration.
2011-10-21 04:26:48 +00:00
Campbell Barton
d37760bc34
cleanup scons build flags, many duplicates because because of confusion between CFLAGS/CPPFLAGS/CCFLAGS/CXXFLAGS, devs would set multiple to be on the safe side.
...
- defines go in CPPFLAGS
- C & C++ flags go in CCFLAGS
- CFLAGS / CXXFLAGS are C OR C++ only.
also commented intended ghost unicode/ascii usage.
2011-10-21 04:23:26 +00:00
Campbell Barton
78a8f8a4b1
- remove release/bin/.blender/.bfont.ttf, we have ./release/datafiles/bfont.ttf already, and its not used anymore.
...
- removed scons WITH_BF_FREETYPE
2011-10-21 03:16:01 +00:00
Campbell Barton
d132b08f33
move fonts/ and locale/ dirs into release/datafiles, since blender wasn't finding them in their current location and so to test international characters you had to 'make install'.
...
updated scons/cmake/translation-scripts.
2011-10-21 03:00:28 +00:00
Campbell Barton
4512f10db9
misc edits
...
- rename define DISABLE_SDL --> WITH_SDL (which was already used in some places)
- blenders interation preset was using orbit rather then turntable 3d view preference (different from factory defaults).
- tagged some unused rna args.
2011-10-20 00:19:21 +00:00
Campbell Barton
67c15da97d
docs / clenup (no functional code changes)
...
- added API examples for mathutils.Color/Euler/Quaternion/Matrix.
- corrected own bad spelling matricies --> matrices.
- minor pep8 edits.
- update CMake ignore file list.
2011-10-17 02:20:53 +00:00
Jens Verwiebe
8dce8e0c17
OSX: make sure the set_simulation_threads script is always renewed
2011-10-15 14:13:49 +00:00
Jens Verwiebe
e7095450e7
OSX: commit the omp_set_simulation_threads applescript and copy-routines
2011-10-14 17:54:37 +00:00
Jens Verwiebe
afcf581fb0
OSX: commit the needed steps for compiling with gcc 4.6.1 and OMP_NUM_THREADS env variable setting
2011-10-14 17:27:55 +00:00
Campbell Barton
9252d425d2
cmake: use cached results for RPM build & dont print annoying rpmbuild missing on every re-run of cmake.
2011-10-14 14:01:39 +00:00
Campbell Barton
43de42824f
cmake's find glew wasnt working right - if glew wasnt found installing the package would not help since the not-found result was cached.
2011-10-14 12:17:35 +00:00
Campbell Barton
fa3b4e1830
correct collada lib linking order (wasnt building for me), and sphinx doc syntax warning.
2011-10-13 14:10:38 +00:00
Brecht Van Lommel
4f33d65ba1
Cycles: svn merge -r40411:40934 ^/trunk/blender
2011-10-11 14:30:53 +00:00
Campbell Barton
ca906b207d
modify pacman file not to compile templates & presets.
2011-10-04 23:00:38 +00:00
Sergey Sharybin
fdd0d7f950
Enabling JACK for linux buildbot.
2011-10-04 17:04:35 +00:00
Campbell Barton
019dca9c54
remove redundant code, also dont bother with os.path.basename(x) for recent scons commit.
2011-10-04 08:28:37 +00:00
Sergey Sharybin
91c38f0aa0
Fix for unix python bundling: config-* directories didn't deleted
...
This is because of passing config-* to rm command in quotes.
2011-10-04 08:20:29 +00:00
Campbell Barton
e42146c1ec
remove .Blanguages, its not used anymore
2011-10-02 22:28:49 +00:00
Campbell Barton
4a0c3e2a12
fix [ #28784 ] CRASHER on load with load_post handler
...
also fix pacman package build spec.
2011-10-02 21:21:14 +00:00
Nathan Letwory
1023ed4e4d
Make sure that default settings have OpenMP support by default (also good for buildbots).
...
Note that builders that don't have VS pro version need to manually disable this setting in their respective user-config.py
2011-10-02 17:53:52 +00:00
Campbell Barton
da73642ed1
remove find samplerate module, use -msse2 flag for intel c++ since its supported.
2011-10-02 17:16:28 +00:00
Joerg Mueller
07ad83a439
* Removing libsamplerate from build systems
...
* Enabling OpenAL for scons win64-vc in default config; Nathan or Sergey: please update the build bot to build with OpenAL!
2011-10-02 17:09:39 +00:00
Campbell Barton
71f772a0ed
minor cmake edits:
...
- osx was defaulting to -O3.
- clang wasnt detecting sse compiler args.
2011-10-02 16:43:39 +00:00
Campbell Barton
077fd13416
cmake:
...
- fix for cmake's SSE detection which would fail because of strict warnings and also had redundant cache setting.
- was incorrectly initializing variables (own bad)
- python was searching for libs on every run, now only do this if there not cached.
2011-10-01 19:52:33 +00:00
Campbell Barton
622e8ee363
cmake: sse flags were being defined in 2 different places
2011-10-01 18:29:40 +00:00
Campbell Barton
7b9f3eac42
fix for odd linking error with ffmpeg.
2011-09-30 16:54:11 +00:00
Campbell Barton
7ef5464236
sse flags for intel c++ compiler
2011-09-30 16:37:46 +00:00
Campbell Barton
cf3956f450
formatting edits only
2011-09-30 15:51:58 +00:00
Campbell Barton
ca2528d551
removing duplicate library linking from cmake, fingers crossed that this wont break on other systems (works here).
2011-09-30 15:21:10 +00:00
Jens Verwiebe
6f9636b800
OSX: another non-ASCII char, sorry
2011-09-29 17:02:19 +00:00
Jens Verwiebe
6088d460ef
OSX: Give clear commenting and more up-to-date defaults
2011-09-28 17:28:37 +00:00
Jens Verwiebe
eb2c89ab87
OSX: change omp default True gor gcc-4.6.1 only atm
2011-09-28 17:21:08 +00:00
Dalai Felinto
78dc35cf29
scons OSX - we don't need extra junk in blenderplayer ;)
2011-09-27 17:26:36 +00:00
Jens Verwiebe
6f2d937a63
OSX: introduced a workaround for compiling with non-apple gcc-4.6.1, ghost must be compiled with apple-gcc nevertheless due objc incompatibilities
2011-09-27 13:18:34 +00:00
Campbell Barton
8a423f59ea
pep8 cleanup and fix for keymap test operator from my own recent fix.
2011-09-26 15:39:15 +00:00
Dalai Felinto
2d91b6cda7
wm.py needs import os in some of its execute funcs + now we can have blender2.60x version :)
...
I guess someone did a cleanup in the file and forgot to test "add an Add-On" ;)
+ a bug I found while studying the cmake files
2011-09-26 06:29:58 +00:00
Campbell Barton
7aa14fdbb9
use the systems number of processes for running static checks - multiple jobs.
2011-09-22 04:41:12 +00:00
Sergey Sharybin
922dadf6ea
buildbot: point python to a symbolic link. Helps when updating libs is happening.
2011-09-21 19:10:06 +00:00
Campbell Barton
4b449aefea
remove support for irix
2011-09-21 08:40:30 +00:00
Brecht Van Lommel
a2c6db0b44
Cycles: svn merge -r40358:40411 ^/trunk/blender
2011-09-20 18:48:28 +00:00
Campbell Barton
8f5112f191
pep8 update & some minor cmake edits.
2011-09-20 18:29:19 +00:00
Brecht Van Lommel
219eeb3e54
Internationalization: fix OS X scons install to copy font and language files
...
correctly.
2011-09-20 15:55:28 +00:00
Sergey Sharybin
07ed73caee
- Fix for compiling without international support
...
- Enable international support for win64 msvc by default
2011-09-20 14:07:40 +00:00
Nathan Letwory
a199c9a4bb
Don't set BF_NUMJOBS in default config, but instead let users do that in user-config.py.
2011-09-20 07:53:20 +00:00
Campbell Barton
13dfd82997
changes for materials to treat them as shorts not int/chars (since they are stored as shorts intermally)
...
- converting nurbs to mesh was casting the material to unsigned char.
- subsurf was casting to char, then int -> short in a loop.
- have material functions take & return shorts.
2011-09-20 06:25:15 +00:00
Campbell Barton
b2e97edc35
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
Jason Hays
2cbf475fb2
Merged 40338-40364
2011-09-19 15:36:30 +00:00
Brecht Van Lommel
153e4cad4b
Cycles: svn merge -r40266:40358 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-19 14:20:15 +00:00
Campbell Barton
83a2f02a78
cleanup endian handling
...
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
2011-09-19 08:02:17 +00:00
Campbell Barton
08d52fcc85
added FindOpenImageIO cmake module.
2011-09-18 04:55:22 +00:00
Campbell Barton
96ada15d79
svn merge -r40197:40311 ^/trunk/blender
2011-09-18 02:35:26 +00:00
Brecht Van Lommel
f4a9215d7c
Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender
...
Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.
2011-09-17 13:28:40 +00:00
Guillermo S. Romero
43259c978e
SVN maintenance.
2011-09-16 17:18:12 +00:00
Campbell Barton
d87fcb0760
- fix for memory leak in findFreeNavPolyIndex()
...
- also correct own script for running cppcheck.
2011-09-16 14:02:44 +00:00
Campbell Barton
2222f536f8
use replace 0 with NULL for pointers, set some functions static
...
also fixed own errors in recent static check commit.
2011-09-16 08:20:21 +00:00
Campbell Barton
0849eaebbf
new convenience makefile targets for static source code cheching: check_splint/check_sparse/check_cppcheck
2011-09-16 06:58:20 +00:00
Sergey Sharybin
86d05b3144
Update build rules to deal with new gettext libraries.
2011-09-15 11:37:42 +00:00
Campbell Barton
ac51152ec5
svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-14 01:32:59 +00:00
Campbell Barton
dd2a2ec699
removed nodes from CMake's BLENDER_LINK_LIBS, rewrote find-pcre using own template.
2011-09-14 01:23:17 +00:00
Campbell Barton
21253def7c
- removed some duplicate library links from cmake (which were needed because of bad level calls)
...
- FindXML2 we had copied from another project was always running and not using cached value, rewrote based on template used for most of our other find modules which makes use of 'FindPackageHandleStandardArgs'
- mark statuc collada libs as advanced.
2011-09-14 01:02:57 +00:00
Sergey Sharybin
a47144a8d2
Enable FFTW3 library for buildslaves
2011-09-13 16:52:42 +00:00
Campbell Barton
7d02e66256
svn merge -r40000:40179 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 10:05:30 +00:00
Campbell Barton
92089e3c4d
svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 09:07:20 +00:00
Campbell Barton
9c4165fde0
svn merge -r39800:39900 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 07:19:36 +00:00
Campbell Barton
b310a76a1b
svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 06:39:17 +00:00
Campbell Barton
297f14a1d6
fix for error linking opencollada on linux.
2011-09-12 13:58:13 +00:00
Sergey Sharybin
899bd19c71
Forgot to add FFmpeg DLLs list to linuxcross config.
2011-09-08 19:05:52 +00:00
Campbell Barton
c61827ed25
patch from Uncle_Entity on IRC for fedora/collada
2011-09-08 03:57:11 +00:00
Jens Verwiebe
7983627500
OSX: revert default compile to i386, for it breakes QTKit-condition for some unknown reason
2011-09-07 14:44:52 +00:00
Campbell Barton
47ffe63c86
remove -Wundef for code we don't maintain & generated code.
2011-09-06 13:00:46 +00:00
Antony Riakiotakis
aabd702dbd
fix link issues with MinGW - a substitute declaration(correctByteOrder) for itoln that was not present in MinGW was being used. Duplicated the declaration from <winsock2.h>(tried including but gave some errors) and added the appropriate link library, wsock32, according to MinGW documentation.
2011-09-06 11:17:29 +00:00
Brecht Van Lommel
b56ffd2cdb
Cycles: svn merge -r39669:39870 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-02 12:33:29 +00:00
Jens Verwiebe
d8394b9d67
set OSX default python to static
2011-08-31 14:46:27 +00:00
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
Brecht Van Lommel
d48e4fc92b
Cycles: fix linux build issue, link order was wrong.
2011-08-25 12:50:52 +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
Brecht Van Lommel
88481246f0
Cycles: small fix for last commit, don't know what's going on here
...
exactly but this solves it for now.
2011-08-24 19:31:14 +00:00
Brecht Van Lommel
dc557b7440
Cycles: linux build tweaks to allow static oiio/boost build.
...
Wiki build instructions have been updated to do static linking now:
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/Cycles/Building
2011-08-24 19:21:04 +00:00
Campbell Barton
81a8f3e885
part of a patch from Dan Eicher for cmake packaging.
2011-08-24 18:23:21 +00:00
Campbell Barton
18d66643f4
this should finally fix collada & ubuntu building with cmake
2011-08-24 18:13:11 +00:00
Campbell Barton
242035fa2d
attempt to fix issue with opencollada + ubuntu ppa
2011-08-24 17:09:25 +00:00
Campbell Barton
9ad6434c4e
opencollada find module. hopefully solves the problem where includes can in an /include
subdir or not.
2011-08-24 16:04:35 +00:00
Campbell Barton
82e622f158
fix [ #28356 ] Import export STL files, problem in script in version r39307
...
& correct some bad comments.
2011-08-24 14:22:41 +00:00
Brecht Van Lommel
29bdf37f9d
Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-24 09:44:08 +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
e39cb8a040
Forgot this in previous commit
2011-08-22 19:00:32 +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
Campbell Barton
7d316b70b8
rename NAN_BUILDINFO --> WITH_BUILDINFO
2011-08-22 16:54:26 +00:00
Campbell Barton
817273931a
buildinfo is now quoted from the build systems, avoids stripping quotes on startup.
...
tested with linux/cmake linux/scons windows/cmake/mingw windows/cmake/msvc
2011-08-22 12:24:14 +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
Brecht Van Lommel
c7fce6be2e
Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-16 18:59:45 +00:00
Brecht Van Lommel
360fcd73fe
Cycles:
...
* add some (disabled) test code for using OpenImageIO in imbuf
* link cycles, openimageio and boost into blender instead of a shared library
* some cmakefile changes to simplify the code and follow conventions better
* this may solve running cycles problems on windows XP, or give a different
and hopefully more useful error message
2011-08-16 16:15:34 +00:00
Campbell Barton
93f135cfda
added cmake configureation presets, so on *nix systems you can do...
...
# minal blender with debug info
make debug lite
# blender with no ui
make headless
# blender as a python module
make bpy
2011-08-16 09:36:15 +00:00
Nathan Letwory
3359b7d7b7
use correct libdir for buildbot win64.
2011-08-11 16:43:36 +00:00
Sergey Sharybin
c9216e390c
Commiting patch from jensverwiebe for NDOF support on OSX
2011-08-11 15:59:19 +00:00
Campbell Barton
349c838996
add missing header to cmake files (else some IDE's wont index it)
2011-08-08 05:43:04 +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
Nathan Letwory
289ef16fcf
Add win64_scons builder
2011-08-03 13:00:11 +00:00
Nathan Letwory
36887bbc82
Add BF_BITNESS for win32/win64
2011-08-03 12:57:38 +00:00
Sergey Sharybin
aac8bab172
Fixing terrible typo.
2011-08-03 12:20:07 +00:00
Sergey Sharybin
f1fb54e126
Switch slave_pack to use new FFmpeg for windows.
2011-08-03 11:47:03 +00:00
Sergey Sharybin
df6dfb93b2
Switch windows buildbot to new FFmpeg 0.8.1.
...
Hope it'll work because i haven't got buildbot slave by hand.
2011-08-03 11:10:19 +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
fd35ee8422
- Switch linux buildbot to FFmpeg-0.8.1
...
- Enable FFmpeg for blenderplayer for linux buildbot.
2011-08-03 09:07:30 +00:00
Nathan Letwory
5c36b75324
Simple argument to be able to explicitely tell the bitness you want to build Blender in.
...
python scons\scons.py BF_BITNESS=32
python scons\scons.py BF_BITNESS=64
So from now on for Windows you don't have to run a specific win32 or win64 Python version
to get the Blender version you want. If you omit the BF_BITNESS flag the bitness as per
Python version will be used as before.
Note that this is an argument, so works *only* on the command-line, not in your user-config.py
2011-08-02 18:33:39 +00:00
Sergey Sharybin
a9b093d9eb
Changes for buildbot rules to use propper spnav library path.
2011-08-02 18:16:48 +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
Jiri Hnidek
2e860a3e85
- Blender could be build with scons again.
2011-08-02 07:02:40 +00:00
Campbell Barton
baa37b1b46
more cmake/x11 edits
...
- added includes for spnav
- added FindSpacenav.cmake which allows using spacenav from a nonstandard path.
- remove NDOF_LIBPATH, use a full library path instead.
2011-08-02 06:32:53 +00:00
Campbell Barton
fcd7d2b486
NDOF related edits
...
- fix for building without NDOF on X11
- quiet some warnings
2011-08-02 05:52:27 +00:00
Mike Erwin
56918978b7
3D mouse support from merwin-spacenav branch
2011-08-02 04:28:05 +00:00
Mike Erwin
dc2609da3d
svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
2011-08-02 01:01:56 +00:00
Campbell Barton
f4293067c1
py api: sphinx doc corrections, pep8 cleanup and style edits, also added __all__ to some modules which were missing it.
2011-07-31 03:15:37 +00:00
Nathan Letwory
24def76ac8
svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
2011-07-29 07:58:03 +00:00
Campbell Barton
2658949752
pep8 cleanup, also print message when attempting to run in animation player mode.
2011-07-29 01:24:03 +00:00
Mike Erwin
6cd4716d1a
enable CMake builds with spacenav (contributed by Kevin Cozens)
2011-07-21 21:34:28 +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
60ae40a0ed
patch [ #28030 ] SCONS Build: Build Date reflects "1" instead of actual date of build
...
by Scott Giese (sgiese)
This bug effected windows and linux.
2011-07-20 06:22:16 +00:00
Campbell Barton
c7532c5b81
update to cmake checker script to also check if our include paths are ok
2011-07-17 12:42:03 +00:00
Sergey Sharybin
9eb1b26312
Fix for recent GHOST SDL commit.
...
SCons rules haven't been changed to deal with new option.
2011-07-12 18:39:46 +00:00
Dalai Felinto
355cb26ff3
blenderplayer bundle in OSX doesn't need script folder (untested)
...
I can't test this here, somehow blender+scons is failing in my building env.
but it should work. Basically it skips the copy of the script folder for the blenderplayer.app
I will test it once buildbot get pass this review ;)
2011-07-05 00:30:27 +00:00
Campbell Barton
2c66ab12e9
minor pep8 edits
2011-07-01 12:33:34 +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
4b1cceddbd
fix for building with msvc/cmake take 2 (think its correct this time)
...
also sync build flags with scons.
2011-06-26 17:18:37 +00:00
Campbell Barton
418bce9341
fix for building with MSVC release, some edits I made didnt work as I expected but still built for debug
2011-06-25 14:10:46 +00:00
Campbell Barton
be94dc10c1
split cmake check configuration out
2011-06-22 05:30:06 +00:00
Campbell Barton
eaae38551f
pep8 compliance
2011-06-21 17:17:51 +00:00
Campbell Barton
d33b63c5d8
update cmake checker to ignore file list and add some headers to the source list.
2011-06-21 17:00:34 +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
Campbell Barton
78ea4561a4
fix for python ABI search, was missing 'd'
2011-06-20 09:39:14 +00:00
Campbell Barton
97a85fe100
- add example for python rna property update
...
- edit the copyright for blender specific cmake find modules
2011-06-20 02:54:56 +00:00
Campbell Barton
c6eaa2300a
cmake: add find jack module
2011-06-19 15:03:50 +00:00
Campbell Barton
a8d4c1f8a9
cmake: add find jemalloc module
2011-06-19 14:55:51 +00:00
Campbell Barton
6790dbe9db
cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables.
2011-06-19 13:06:21 +00:00
Campbell Barton
e7c8169086
add back PYTHON_LIBPATH, needed for installing on python
2011-06-19 11:04:15 +00:00
Campbell Barton
def6bcd4e5
cmake add module for finding fftw3.
...
also allow debug blender to build with non debug python
2011-06-19 08:57:34 +00:00
Campbell Barton
167bcc2b67
cmake: add libsamplerate find module
2011-06-19 08:20:02 +00:00
Campbell Barton
b15a2b0ffc
cmake: added FindOpenJPEG module.
2011-06-19 07:46:24 +00:00
Campbell Barton
145944d66f
cmake:
...
new macro file_list_suffix() for adding a suffix to every file in a path before the file extension.
useful to create names for debug libs on windows.
2011-06-19 06:57:56 +00:00
Campbell Barton
2c68bdb03e
cmake: make python search into a find package module.
2011-06-18 15:53:47 +00:00
Campbell Barton
5e59d0c8bb
make better use of cmake builtin funcitons for finding python library/header
2011-06-18 15:15:31 +00:00
Campbell Barton
968b2a8afb
rename cmake include/libraries to conform with suggested cmake names
2011-06-18 14:12:54 +00:00
Campbell Barton
549c2c58a1
added FindSndFile cmake module to replace inline checks.
2011-06-18 12:12:19 +00:00
Campbell Barton
82216030e9
py-api: store frequently used strings as unicode PyObject's to avoid creating/distroying every time.
...
also fix for cmake warning
2011-06-18 08:45:45 +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
Campbell Barton
2e8ca6d196
include some extra search paths for cmake openexr
2011-06-16 02:55:26 +00:00
Campbell Barton
0575c05eb0
fix to FindOpenEXR pointed out by Sergey Sharybin,
...
also added check for IlmThread and marked individual library cache variables as advanced.
2011-06-16 02:48:07 +00:00
Campbell Barton
04c5f054d8
error in recent commit
2011-06-15 14:00:50 +00:00
Campbell Barton
c02121b708
use full library paths for openexr & msvc, also remove unneeded exr includes
2011-06-15 13:54:57 +00:00
Campbell Barton
bb6e0834e0
cmake: combine debug/optimized into one target_link_libraries() call.
2011-06-15 13:42:02 +00:00
Campbell Barton
4f3936083a
replace own inline cmake include search logic for a typical FindXXX.cmake module.
2011-06-15 12:09:02 +00:00
Campbell Barton
1243992f27
cmake: correct uninitialized vars
2011-06-14 00:24:50 +00:00
Nathan Letwory
1b1fdd7ecf
Turn off Quicktime support by default. Will be phased out soon.
2011-06-13 09:33:27 +00:00
Campbell Barton
fedc811014
minor updates to the cmake checker
2011-06-13 03:09:14 +00:00