Martijn Berger
ace071f99e
prepare 32bit build msvc2013 scons/buildbot
2014-02-18 23:15:40 +01:00
Martijn Berger
727ef0dfde
win32 MSVC 2013 add scons support
2014-02-13 19:15:43 +01:00
Jens Verwiebe
a84bcea070
OSX/scons: allow for compiling with clang-openmp-3.4
...
See: http://clang-omp.github.io
+ fix a longstanding bad include in darwin-config
2014-02-09 18:03:13 +01:00
Lawrence D'Oliveiro
cb0a5adc56
SCons: cleaner determination of 32-bit/64-bit builds
...
Try not to be x86-centric, remove unneeded blenderdeps variable.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D240
2014-02-04 19:01:10 +01:00
Martijn Berger
21d587d9fc
Added option to have a seperate environment for executing nvcc
...
This can be used to compiler cuda kernels with Visual Studio 2010 while
the rest of blender is compiled with MSVC 12.0 / 2013
2013-12-29 14:57:21 +01:00
Martijn Berger
42044a96e4
Basic scons support for building with Visual Studio 2013 although full MSVC 2013 support still needs more work in scons itself
2013-12-27 19:46:55 +01:00
683093b5c8
CMake/Scons Build: disable explicit linking to libstdc++ on Linux/Unix.
...
It's not needed, this should happen automatically already, and if you build
against libc++ instead (as on recent FreeBSD), this would give build errors.
Ref T37477.
2013-11-28 18:07:57 +01:00
Sergey Sharybin
764204baf2
Remove debug prints from SCons' python module
...
Seems to be left by accident in rB9a79e03752509997e99094763f9183e6e5ce3637
If not, please do prints more verbose :)
2013-11-28 19:46:23 +06:00
Jens Verwiebe
463b65bf0a
OSX/scons: ARCH_FLAGS where not prperly added to CPPFLAGS
2013-11-07 13:56:40 +00:00
Jens Verwiebe
ec470d731e
OSX/scons: for completeness, added WITH_BF_OPENMP switch
2013-11-06 23:19:01 +00:00
Jens Verwiebe
f392ebd77e
OSX/scons: huge change, now you can set a user-config.py just with the desired variables changed
2013-11-06 20:59:04 +00:00
Jens Verwiebe
480d4317de
OSX/scons: remove obsolete compile flag
2013-11-06 15:46:57 +00:00
Jens Verwiebe
c81c0859ee
OSX/scons: remove obsolete compile flags and silence warnings same time
2013-11-06 15:42:01 +00:00
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
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
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
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
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
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
a5b78bb6bd
replace use of 'a.find(b) != -1' --> 'b in a'
2013-06-24 05:55:05 +00:00
Jürgen Herrmann
86bebb3380
Fix for #35851 :
...
- Make scons work for non western CL.exe.
2013-06-24 05:45:03 +00:00
Jürgen Herrmann
d7b99389ba
prevent cycles sm_35 kernel to be built on win32 with vs2012 because of ptxas crashes.
...
Workaround to keep buildbot running.
I filed a bug report to NVidia, will remove this as soon as the problem is fixed.
2013-06-23 19:07:46 +00:00
Brecht Van Lommel
8d6e5e2fee
Cycles: update build configurations to include CUDA sm_35 architecture. When using
...
a compiler older than CUDA 5.0 it will give a warning and skip this architecture.
2013-06-20 13:10:47 +00:00
Jürgen Herrmann
eae9519f9d
VS 2012 x86 SCons update.
2013-06-18 20:11:58 +00:00
Jürgen Herrmann
836b91c9c7
Scons and BuildBot changes for MSVC 2012 support.
...
Thanks Brecht and Thomas for reviewing ;)
2013-06-18 11:55:32 +00:00
Antony Riakiotakis
29871b29b5
Fix compilation on MinGW32 scons. The compiled library there is already static, revert renaming of linked library
2013-06-03 06:40:25 +00:00
Sergey Sharybin
732c566f2f
Fix #35587 : Cycles: image movie to single image crashing
...
Crash was happening on windows platforms only and was caused
by some specifics about how CRT works.
Basically, blender and all of the .dll are compiled with /MT
flag, which means blender.exe and all .dll are using separate
environments. This makes it impossible to pass file descriptors
from blender to other dll, because it becomes invalid in the dll.
And this is exactly what was happening: OIIO was trying to open
movie file with all known plugins and one of them was zlib. And
the way OIIO was using zlib API is opening the file using Boost
and passing a file descriptor to zlib. And since zlib was a
dynamic library this lead to general issues using this descriptor
in zlib code.
Solved by linking to zlib statically. This allows to safely pass
file descriptor to zlib API. Alternative would be to compile all
the stuff with /MD flag, but that's much bigger and less robust
way to fix the issue.
Tested on windows using msvc2008, scons plus cmake both 32 and 64
bit versions. Seems to be working fine.
Further tweaks for mingw and msvc2012 could be needed tho.
2013-06-02 15:02:17 +00:00
Bastien Montagne
9a79e03752
Various fixes to scons for linux:
...
* Better handling of "multiarch" python stuff (libs also need two different paths).
* Fix Opencollada default paths.
Hopefully this won't break anything...
2013-05-29 18:55:02 +00:00
Sergey Sharybin
c987aa7df5
Hopefully scons+llvm works again.
2013-05-28 14:05:12 +00:00
Antony Riakiotakis
f3f5e9553e
Turn OpenMP on for MinGW, it works the 32 bit compiler.
2013-04-17 19:54:25 +00:00
Antony Riakiotakis
15f3bbfe9e
Fix some compilation errors for MinGW. Thanks to vildas on irc for
...
bringing this to attention.
2013-04-13 16:29:18 +00:00
Tamito Kajiyama
eeb95280be
Missing build_files updates in the merger in revision 55847.
2013-04-07 06:44:33 +00:00
Jens Verwiebe
be2626f9f4
Fix freestyle compile with scons
2013-04-06 18:06:06 +00:00
Gaia Clary
4707f1de17
modified build system for updated opencollada libraries (windows only, other platforms might want to update as well)
2013-03-28 18:02:24 +00:00
Thomas Dinges
dc90ce5b6d
Cycles GPU rendering:
...
* Deprecate computing capability 1.3 (sm_13)
This commit disables auto build of sm_13 CUDA platform, which means that starting with Blender 2.67, we don't support sm_13 devices anymore. It has become difficult to support that and it was already feature incomplete (no render-passes, AO, Multi Closure etc).
It's still possible to manually enable sm_13 for own tests, but building might break in the future.
2013-02-21 17:14:07 +00:00
Brecht Van Lommel
50f7328fb6
Fix scons win32 link error with OSL, also fix a GLEW linker warning
2013-02-10 20:47:44 +00:00
Campbell Barton
76b7afd909
removing xinerama on X11 dependency, this wasn't working very usefully.
2013-02-07 14:10:01 +00:00
Campbell Barton
2c1219dc17
enable xinerama for scons.
2013-02-06 01:28:56 +00:00
Jens Verwiebe
98ecb72379
OSX/cmake/scons: python version foolproof
2013-02-05 19:49:53 +00:00
