sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
50,757 Commits 2 Branches 0 Tags 753 MiB
5557332488
Commit Graph

883 Commits

Author SHA1 Message Date
Jens Verwiebe
5557332488 OSX/scons: remove another outdated conditional 2013-11-06 15:37:14 +00:00
Jens Verwiebe
3e6c369888 OSX/scons: remove local MAC_MIN_VERS var and use the always identical MACOSX_DEPLOYMENT_TARGET instead 2013-11-06 14:03:51 +00:00
Jens Verwiebe
96aaea414b OSX/scons: more cleanup of redundant vars, preparation to remove local vars to not need to cp whole config as user-config later 2013-11-06 13:56:11 +00:00
Jens Verwiebe
5f084aced0 OSX/scons: simplification for getting the system version ( major, minor ), use sw_vers -productVersion instead of uname -r, we must not redine it then from darwin version -> osx version 2013-11-06 12:52:09 +00:00
Brecht Van Lommel
99c5e71397 Quicktime: remove backend with the old quicktime API, and keep the QTKit backend. 
This means that if you have WITH_BF_QUICKTIME or WITH_CODEC_QUICKTIME enabled,
it will always use QTKit.

The old backend was only used on 32 bit OS X builds, now 32 and 64 bit builds will
give consistent input/output. On Windows or Linux quicktime isn't being used.
 2013-11-06 01:45:15 +00:00
Jens Verwiebe
6477062b6b OSX/scons: buildbot cleanup following darwin-config 2013-11-05 18:25:43 +00:00
Jens Verwiebe
864920ee41 OSX/scons: make 10.5 our lowest env and remove older conditionals 2013-11-05 18:17:02 +00:00
Jens Verwiebe
6c4b06a46d OSX: also remove USE_QTKIT option from configs, leave env var for later use ( always True ) 2013-11-05 16:04:32 +00:00
Jens Verwiebe
25b1280c50 OSX: buildbot cleanups after carbon removal 2013-11-05 16:00:23 +00:00
Jens Verwiebe
78d8a14174 OSX: complety remove the cocoa options, definitions and conditionals now 2013-11-05 15:37:59 +00:00
Jens Verwiebe
d278b59032 OSX/scons: remove obsolete cocoa conditionals from config 2013-11-05 14:38:18 +00:00
Jens Verwiebe
52588bf014 OSX: preparing carbon and quicktime dropping, make QTKit also default for i386 2013-11-05 12:52:51 +00:00
Jens Verwiebe
dd697f8bd4 OSX: preparing carbon and quicktime dropping, make 64bit and QTKit default, make 10.8sdk default for xcode >= 4.4 2013-11-05 12:48:32 +00:00
Sergey Sharybin
2010c6ad6c Made buildinfo aware of builds from GIT 
- Use commit number since last annotated tag as a
  revision number replacement. It'll eb followed
  by 'M' symbol if there're local modification in
  the source tree.

- Commit short SHA1 is included. Helps getting
  information about commit used to build blender
  with much faster.

- If build is not done from master branch, this also
  will be noticed in the splash screen.

This commit also replaces revision stored in the
files with git-specific fields (change and hash).
This is kind of breaks compatibility, meaning
files which were saved before this change wouldn't
display any information about which revision they
were saved with. When we'll finally switch to git,
we'll see proper hash and change number since
previous release in the files, for until then
svn version will be used as a change number and
hash will be empty.

Not a huge deal, since this field was only used
by developers to help torubleshooting things and
isn't needed for blender itself.

Some additional tweaks are probably needed :)
 2013-11-04 13:21:39 +00:00
Bastien Montagne
bdc3e1e5de Minor update to r60953. 2013-10-31 13:11:01 +00:00
Jens Verwiebe
4ef6f82a10 OSX/codesigning: add the signing rules used for releases 2013-10-28 17:08:07 +00:00
Bastien Montagne
e293a0b153 Update OpenEXR to 2.0.1, this seems to fix some issues. 
I *really* have to go back over all our patches in this script and try to port them back in respective projects!
 2013-10-27 08:19:08 +00:00
Campbell Barton
01da2c0e53 fix [#37195] particles crash with viewport render 2013-10-26 22:38:12 +00:00
Campbell Barton
93edbf3510 add check for cmake that source files are not included multiple times 2013-10-25 06:21:38 +00:00
Campbell Barton
b6db417ee4 code cleanup: use const's for vector args. 2013-10-12 02:19:37 +00:00
Dalai Felinto
6549c1bf29 scons file for OIIO (needed for psd) 
based on patch by Shinsuke Irie

note: scons is not working for me at the moment so I did not test this
patch. It should work fine though.
 2013-10-11 16:38:31 +00:00
Bastien Montagne
58af8d4387 Fix for conf instructions for scons... 2013-10-07 07:42:00 +00:00
Jens Verwiebe
f418097bc6 OSX/Scons/OMP: 1. Allow for compile with gnu gcc 4.8.1, 2. fix compiling with sdk > 10.7 by using libgomp dynamic, which includes proper errorhandling vs. static. Before xtra linking to system libstdc++.6.dylib was needed, which then caused incompatibilities 2013-09-28 18:42:14 +00:00
Bastien Montagne
60e1fc70d2 install_deps.sh fix: add explicit OGG lib handling, we need it to pass correct values for ffmpeg libraries (at least for static builds). 
I’m not close to understand why this has worked fine until today... :/

Only tested with Debian, but I would not expect any issue with Fedora/Suse/Arch, this is a quite simple change!
 2013-09-27 13:56:16 +00:00
Campbell Barton
124f32a206 rename LLVM_LIB_DIR to LLVM_LIBPATH to match other cmake vars. 2013-09-25 16:31:54 +00:00
Campbell Barton
203c6effd5 code cleanup: quiet rna warnings, remove remove_strict_flags() for cmake/rna. 
also set_source_files_properties() wasn't working for rna_*_gen.c files,
set dna.c and generated data files with generated property too.
 2013-09-20 06:35:28 +00:00
Bastien Montagne
67ae8cfcf5 Fix own stupid error in previous commit... :/ 2013-09-19 20:27:26 +00:00
Bastien Montagne
0be2e21e2d Potential fix for install_deps.sh OSL build issues reported by users: run ldconfig immediately after lib compile (looks like OSL compile process needs boost libs...). 2013-09-19 11:25:47 +00:00
Bastien Montagne
b35f1eaa84 Fix py/numpy build under Suse, and minor other fixes/enhancements. 
Also switch to python3.3.2
 2013-09-17 11:01:52 +00:00
Sergey Sharybin
4478197ef6 Somplify one-liner for CPU cores detection and make it aware of multi-CPU computers 2013-09-17 09:17:10 +00:00
Bastien Montagne
31b84c9c28 Grrr, forgot to update getopt command for updated args... 2013-09-16 15:48:37 +00:00
Bastien Montagne
01747a9cf0 Add --required-numpy to force compilation of both py3.3 and numpy1.7 in case you really need numpy and 1.7 is not available! 2013-09-16 15:22:10 +00:00
Daniel Salazar
0732375d35 Making install_deps.sh correctly see hyperthreading 2013-09-16 14:38:33 +00:00
Bastien Montagne
fa1683e713 Install_deps.sh updates: 
* Raise OpenCOLLADA version to 18da7f4109a8eafaa290a33f5550501cc4c8bae8 as requested by Gaia.
* Made OSL build/install ON by default (no more an experimental feature!).
* Use default LLVM version under Debian (specifying a version does not work with OSL when you have more that one installed :( ).
 2013-09-16 13:02:49 +00:00
Jens Verwiebe
13263541ec OSX/scons: take xcode-select path into account, to work well with different xcode versions 2013-09-13 15:41:18 +00:00
Jens Verwiebe
97e823488c OSX/Scons/clang: restrict the ftemplate fix to clang only 2013-09-10 12:31:21 +00:00
Jens Verwiebe
d638c4c064 OSX/Scons/clang: compilefix for libmv, as discussed with brech just globally 2013-09-09 17:26:09 +00:00
Campbell Barton
648f2102d8 update bmesh doxy docs, remove double-promotion warnings in remove-strict-flags cmake macro. 2013-09-08 06:55:58 +00:00
Brecht Van Lommel
f634509dc2 CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth. 2013-09-06 12:43:27 +00:00
Campbell Barton
6d87f2749d remove freebsd7 config. its fairly old and not maintained. 2013-09-04 23:44:41 +00:00
Campbell Barton
90b9fa3608 fix [#36459] Official blenderplayer can not go fullscreen on Linux 
use modified patch from Alex Fraser (z0r)
 2013-09-04 23:43:25 +00:00
Campbell Barton
427317d8d8 use CMAKE_DL_LIBS rather then linking libdl directly. 
added to cycles standalone too.
 2013-08-30 20:26:57 +00:00
Campbell Barton
f75711db7f cmake: set python, llvm and osl libs as advanced. 2013-08-28 04:32:39 +00:00
Brecht Van Lommel
11cfc97e29 Fix cmake Inkscape auto generate of SVG on OS X giving an error popup, the binary 
that is found by find_program is a shim that doesn't take command line arguments.
 2013-08-26 14:13:04 +00:00
Bastien Montagne
e61c3beb48 Remove (comment out) auto-generating png form svg (r59382) in CMake, handy but gives nasty "false changes" in svn. Let's try not to forget to update PNGs when needed, then! 2013-08-26 12:16:23 +00:00
Bastien Montagne
29c8d3e20d Automatically re-generate png icon files from svg ones (CMake only for now)... Expects Inkscape program. 2013-08-22 13:51:00 +00:00
Bastien Montagne
4c38db307e Fix [#36534] Errors in install_deps.sh script when running on Arch Linux 
Patch provided by Darren Beck, thanks!
 2013-08-22 06:05:40 +00:00
Sergey Sharybin
db01d290e7 Compilation error fix when using scons 
OpenEXR libraries shall go after OpenImageIO,
otherwise it'll fail to find symbols needed
for OIIO.
 2013-08-15 12:05:42 +00:00
Campbell Barton
a62163ada3 remove unused auto-key struct-member from uiAfterFunc, add compiler defines to cppcheck utility script. 2013-08-10 23:27:42 +00:00
Bastien Montagne
65b4f41342 Linux install_deps: update OpenCOLLADA to 828b60384552b83e55d2af7055f07d2c40b4d3f4 repo UID. 2013-08-10 11:06:46 +00:00