griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
85,281 Commits 1 Branch 0 Tags
3ad2d6caef7410aec67ebde416f03c9a06014e8a
Commit Graph

2070 Commits

Author SHA1 Message Date
Ray Molenkamp
1d2fc413c8 make.bat: Preliminary Visual Studio 2019 support. 
VS2019 is binary compatible with the existing vc14 libraries and no
new libraries libs are required in svn.

VS2019 support requires cmake 3.14.

VS2019 is still in pre-release state, you are required to explicitly
select the pre-release version by using:

make full 2019pre
 2019-02-22 20:54:27 -07:00
Ray Molenkamp
633b77b0ee Make.bat: Fix sub-module detection 2019-02-22 20:53:29 -07:00
Ray Molenkamp
8ed6985017 Windows: Use static pthreads library. 2019-02-21 14:19:15 -07:00
Brecht Van Lommel
c5f13ecbc0 Merge branch 'blender2.7' 2019-02-17 15:57:34 +01:00
Ray Molenkamp
b428929319 Windows: Fix building with llvm/clang 7.0.1 
For llvm 6 the visual studio integration was 'not great' and we had
our own, which broke when llvm 7.0.1 came out. llvm now has properly
supported integration available on the VS market place hence we can
retire our custom support.
 2019-02-16 11:36:19 -07:00
Campbell Barton
672d7d2d9c Cleanup: indentation 2019-02-14 08:49:26 +11:00
Arto Kitula
11ec57e211 fix build on xcode with openmp 2019-02-13 22:34:40 +02:00
Jacques Lucke
7262ac6202 Fix T61332: Python3 syntax errors 2019-02-09 13:10:34 +11:00
Campbell Barton
40f2afcf1d Cleanup: remove contributors for Python files 
Following removal from C source code.

See: 8c68ed6df1
 2019-02-05 09:17:00 +11:00
Campbell Barton
ab5e69e660 Cleanup: remove contributors for CMake files 
Following removal from C source code.

See: 8c68ed6df1
 2019-02-05 09:10:32 +11:00
Brecht Van Lommel
94d88df3a8 Merge branch 'blender2.7' 2019-01-26 15:54:13 +01:00
Arto Kitula
b7a9e980a1 macOS: add support for OpenMP, making smoke/fluid/cloth simulations faster. 
This bring macOS on par with Windows and Linux. It uses the OpenMP library
added to our precompiled libraries.

Custom flags are set because FindOpenMP from CMake below 3.12 does not support
AppleClang, and more recent versions do not work with our custom directory
location either.

Differential Revision: https://developer.blender.org/D4257
 2019-01-26 15:48:56 +01:00
Ray Molenkamp
e1efaa6f74 make.bat: remove stray quote in msvc2017 detection. 
Shouldn't cause issues, but better safe than sorry.
 2019-01-24 15:21:31 -07:00
Campbell Barton
f0247b5a5c Cleanup: remove make wrapper 
Intended for silent build output,
ninja build system can do this now.
 2019-01-24 23:25:18 +11:00
Brecht Van Lommel
c59370bf64 Merge branch 'blender2.7' 2019-01-18 21:00:24 +01:00
Brecht Van Lommel
1e3203986c Cleanup: remove unnecessary CUDA architecture sm_72, it's for Tegra chips. 2019-01-18 12:38:19 +01:00
Campbell Barton
5f22de8439 Merge branch 'blender2.7' 2019-01-16 00:27:10 +11:00
Guillermo S. Romero
b5a860c9cc CMake: Improve handling of missing TBB & OpenVDB 2019-01-15 11:14:36 +11:00
Brecht Van Lommel
b17591731d Build environment: fixes for Linux debug libraries build. 2019-01-14 15:57:53 +01:00
Brecht Van Lommel
60799d6fee Merge branch 'blender2.7' 2019-01-09 17:20:58 +01:00
Brecht Van Lommel
49e3f08815 Build Environment: install clang-format for macOS / Linux. 
It's already there for Windows.
 2019-01-09 17:18:49 +01:00
Sergey Sharybin
64671e53d2 Build script: Don't use external Pugi for OSL 
Now, things are becoming REALLY confusing. The script does build
pugi, but is never telling OIIO to use an external one. Which makes
it to use a bundled one.

Trying to link OSL to a different version of pugi causes a lot of
linking errors.

Interestingly enough, that was me who made OSL to use external pugi
to solve configuration problem. But now i can not reproduce that
anymore.

Ideally we would either link everything against our pugi, or not
compile it at all.
 2018-12-24 14:41:06 +01:00
Brecht Van Lommel
c9df453ce7 Update for moving blender2.8 to master. 2018-12-21 12:15:21 +01:00
Brecht Van Lommel
e72f989cf4 Update for moving master to blender2.7 branch. 2018-12-21 12:01:05 +01:00
Sergey Sharybin
76d04f9514 Merge branch 'master' into blender2.8 2018-12-19 12:58:22 +01:00
Sergey Sharybin
593ed1347c Build info: Ensure hash length is same across all platforms and has no conflicts 
The original issue was that different platforms will use different
hash lengths, just because defaults on Git client were different.

Now we use explicit length for the hash, and length is the same as
is used for short hashes in Linux -- apparently they started to have
collisions with length of 11.
 2018-12-19 12:56:32 +01:00
Sergey Sharybin
ccc09ec124 Merge branch 'master' into blender2.8 2018-12-14 17:40:27 +01:00
Sergey Sharybin
4e3562f45a Dependencies builder: Don't rely on system-wide PugiXML 2018-12-14 17:39:38 +01:00
Ray Molenkamp
fdab9a8ed1 Merge remote-tracking branch 'origin/master' into blender2.8 2018-12-13 07:01:00 -07:00
Ray Molenkamp
756c99b504 deps: add missing sqlite dll to windows build. 2018-12-13 06:59:37 -07:00
Ray Molenkamp
d1237d24ca Merge remote-tracking branch 'origin/master' into blender2.8 2018-12-11 15:14:00 -07:00
Ray Molenkamp
ba8d6ca3dd dependencies windows: Replace pthreads-win32 2.9.1 with pthreads4w 3.0.0 
maintenance seems to have stopped for pthreads-win32
 2018-12-11 15:12:56 -07:00
Ray Molenkamp
81449320e4 Merge remote-tracking branch 'origin/master' into blender2.8 2018-12-05 08:46:12 -07:00
Ray Molenkamp
4cb6d97691 deps: update opencollada to v1.6.68 2018-12-05 08:44:50 -07:00
Bastien Montagne
fb3f1a3567 Merge branch 'master' into blender2.8 2018-12-05 14:41:00 +01:00
Bastien Montagne
e7643ee6b4 Install_deps: bump collada version to 1.6.68. 2018-12-05 13:52:39 +01:00
Brecht Van Lommel
b9b88d59dd Merge branch 'master' into blender2.8 2018-12-04 16:35:16 +01:00
Brecht Van Lommel
f63da3dcf5 Buildbot: enable support for NVIDIA Turing cards in Cycles (like GTX 20xx). 
We currently only build the sm_7x kernels with CUDA 10.0, older cards still
use 9.1 until rendering errors are solved for them.
 2018-12-04 16:03:18 +01:00
Brecht Van Lommel
b14ec18601 Cycles: add initial CUDA 10.0 support, but only recommend use for Turing cards. 
There may still be rendering errors when used for older graphics cards.
 2018-12-04 16:03:18 +01:00
Campbell Barton
140f2209b6 Cleanup: correct typo, no need for ./ prefix 2018-11-29 12:54:30 +11:00
Campbell Barton
b02696f855 CMake: add missing files 2018-11-29 09:01:03 +11:00
Campbell Barton
1e10206590 Merge branch 'master' into blender2.8 2018-11-29 08:55:34 +11:00
Campbell Barton
fb057153b0 CMake: update checker 
Support skipping cmake files
 2018-11-29 08:55:05 +11:00
Sergey Sharybin
3ed0d5b4d4 Merge branch 'master' into blender2.8 2018-11-28 14:42:38 +01:00
Sergey Sharybin
683662e630 Add cross-platform NUMA library 
Makes it simple to use NUMA libraries on various platforms.
 2018-11-28 14:35:26 +01:00
Brecht Van Lommel
b71006ceed Fix T58088: OpenSubdiv not enabled by default in macOS builds. 2018-11-27 14:40:25 +01:00
Sergey Sharybin
0970ed0550 Merge branch 'master' into blender2.8 2018-11-26 12:00:36 +01:00
Sergey Sharybin
acd1d1a31d CMake: Remove Cycles specific OpenSubdiv options 
Just use one flag which enables OpenSubdiv globally for all the
areas of Blender.
 2018-11-26 11:41:38 +01:00
Brecht Van Lommel
920525c216 Merge branch 'master' into blender2.8 2018-11-23 12:11:44 +01:00
Brecht Van Lommel
956e58679c Fix T57998: crash at start with jemalloc package on some Linux distributions. 
The jemalloc library must be ahead of pthread in linking order, so jemalloc
can find the pthread symbols for its background thread.
 2018-11-23 11:26:31 +01:00