griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
73,777 Commits 1 Branch 0 Tags
c8e87edccbd0f7dfba33db8f792e9b1182e41de4
Commit Graph

1724 Commits

Author SHA1 Message Date
Campbell Barton
eeb621566a Merge branch 'master' into blender2.8 2018-02-04 10:46:34 +11:00
Ray Molenkamp
36c1122b96 msvc: Use source folder structure for project file. 
This patch changes the huge list of projects in visual studio into a nice tree matching the source folder structure. see D2823 for details.

Differential Revision: http://developer.blender.org/D2823
 2018-02-03 16:38:27 -07:00
Campbell Barton
c3eb22e2ab Merge branch 'master' into blender2.8 2018-02-02 14:15:29 +11:00
Ray Molenkamp
1a840c3e27 Fix T53951: Copy ms runtime dlls using InstallRequiredSystemLibraries.cmake 
Differential Revision: https://developer.blender.org/D3032
 2018-02-01 08:26:14 -07:00
Campbell Barton
88174bd22c Merge branch 'master' into blender2.8 2018-01-28 15:18:33 +11:00
Campbell Barton
19b1b45d71 make_quickie: replace os.system w/ subprocess.call 2018-01-26 12:53:42 +11:00
Campbell Barton
0f14c72c29 project_info: replace os.system w/ subprocess.check_call 2018-01-26 12:38:07 +11:00
Campbell Barton
7389bfdeb0 Merge branch 'master' into blender2.8 2018-01-24 11:45:34 +11:00
Campbell Barton
bd5696f857 CMake: store icon names 
Without this, adding/removing icons wouldn't force cmake to re-run
making builds fail.

This is the same issue with globbing source code.
 2018-01-24 11:32:58 +11:00
Campbell Barton
4ebcdff873 Merge branch 'master' into blender2.8 2018-01-23 20:04:54 +11:00
Campbell Barton
41e930ac66 Cleanup: CMake whitespace 2018-01-23 17:25:09 +11:00
Sybren A. Stüvel
10e6da1f2d Merge branch 'master' into blender2.8 2018-01-17 17:47:38 +01:00
Ray Molenkamp
a8fc44299b external_libs: Add openjpeg to the mavc lib folders for cycles standalone. 2018-01-17 07:45:05 -07:00
Brecht Van Lommel
cdc31c3e6e Merge branch 'master' into blender2.8 2018-01-13 02:05:49 +01:00
Brecht Van Lommel
6b3d85fa51 Build: auto detection of libraries built by "make deps" on Linux. 
Use the libraries if they exist in ../lib/linux_x86_64 or similar, so
that you can run "make deps && make full" to get a full static build.
Note that install_deps.sh is still the only officially supported way to
build Blender dependencies on Linux, but this may be useful to some.

Differential Revision: https://developer.blender.org/D2980
 2018-01-11 22:30:31 +01:00
Sergey Sharybin
83e84b2c2c Merge branch 'master' into blender2.8 2018-01-09 12:52:13 +01:00
Bastien Montagne
850f73638c install_deps: Fix OCIO always re-cloning its whole git repository. 2018-01-08 16:34:34 +01:00
Bastien Montagne
5a6a819b5d Merge branch 'master' into blender2.8 2018-01-04 10:36:50 +01:00
Arto Kitula
25418be97e build deps: llvm new website download locations 2018-01-03 14:52:25 +02:00
Campbell Barton
be40389165 Merge branch 'master' into blender2.8 2018-01-03 23:44:47 +11:00
Bastien Montagne
e84966ac42 nstall_deps: llvm downloads new website location 
Patch by Lucas Walter (@lucasw), thanks.

Reviewers: mont29

Reviewed By: mont29

Subscribers: mont29

Differential Revision: https://developer.blender.org/D2983
 2018-01-02 15:23:45 +01:00
Brecht Van Lommel
ac934efc5e Build: fix make deps TBB on Linux, older versions don't support GCC 7. 2017-12-30 00:07:33 +01:00
Brecht Van Lommel
6a225a283e Build: fix make deps OpenSubdiv build on Linux. 2017-12-29 22:53:32 +01:00
Campbell Barton
4737b95b65 Merge branch 'master' into blender2.8 2017-12-11 19:24:37 +11:00
Campbell Barton
c568985118 MSVC: Fix compiling with some system languages 
Report from @cyaoeu that compiling failed for Japanese system language.
 2017-12-10 15:19:50 +11:00
Campbell Barton
1c0905be0f Merge branch 'master' into blender2.8 2017-12-08 00:21:54 +11:00
Campbell Barton
efdd8f12a0 CMake: GREATER_EQUAL is from v3.7, use GREATER 2017-12-08 00:20:48 +11:00
Campbell Barton
7ca8af4cc8 Merge branch 'master' into blender2.8 2017-12-06 16:51:37 +11:00
Campbell Barton
2480a190de CMake: remove git found message 2017-12-06 16:37:50 +11:00
Antonio Vazquez
272973804e Merge branch 'master' into blender2.8 2017-12-05 19:04:34 +01:00
Campbell Barton
a580565086 CMake: avoid checking each MSVC minor revision 2017-12-06 03:38:44 +11:00
Antonioya
a65695759c Fix MSVS2017 compiler version 
After last update to Visual Studio 2017 15.5.0 the compiler version changed
 2017-12-05 17:16:02 +01:00
Campbell Barton
03a5eccc94 Merge branch 'master' into blender2.8 2017-11-30 18:30:41 +11:00
Campbell Barton
28d2148b09 Haiku OS Support 
D2860 by @miqlas

Even though Haiku is a niche OS, only minor changes are needed.
 2017-11-30 18:05:21 +11:00
Julian Eisel
7f96323cd0 Merge branch 'master' into blender2.8 2017-11-19 13:16:14 +01:00
Campbell Barton
abd5841441 CMake: remove solaris path 2017-11-19 03:46:50 +11:00
Dalai Felinto
1cb6cea71c Merge remote-tracking branch 'origin/master' into blender2.8 2017-11-13 11:48:48 -02:00
Sergey Sharybin
42dff6cc2e Cycles: Fix compilation error with OIIO compiled against system PugiXML 2017-11-13 10:42:29 +01:00
Brecht Van Lommel
2440415bd3 Merge branch 'master' into blender2.8 2017-11-07 03:08:24 +01:00
Arto Kitula
956ee5e265 macOS: remove old OpenMP lib stuff from cmake 2017-11-06 23:54:35 +02:00
Campbell Barton
58dc114615 Merge branch 'master' into blender2.8 2017-11-06 00:12:28 +11:00
Campbell Barton
914e3b1645 Cleanup: indentation, line wrapping 2017-11-05 14:50:15 +11:00
Brecht Van Lommel
d2ea1b2dcd Fix broken macOS build with libsndfile, name is different than in master. 2017-11-04 17:50:09 +01:00
Campbell Barton
619600a53f CMake: cleanup 2017-10-30 18:48:27 +11:00
Campbell Barton
e8daf2e3ea CMake: cleanup 2017-10-30 12:59:36 +11:00
Germano
bed3cbdf3d Merge branch 'master' into blender2.8 
# Conflicts:
#	build_files/cmake/macros.cmake
#	build_files/cmake/platform/platform_win32.cmake
 2017-10-29 18:20:24 -02:00
Ray Molenkamp
475ec5269a CMake: use only absolute linker paths for msvc. 
cmake's link_directories will supply forward slashes for the search paths, the msvc linker has some issues with that, while it will search for the needed libs just fine, the incremental linker gets fed forward slashes for some libs, while the previous binary has backward slashes in it's metadata, the linker assumes obj files got added and performs a full link instead of an incremental link. This change brings down the link time with newer msvc versions for a trivial edit down from a few minutes to a few seconds.
 2017-10-29 13:16:22 -06:00
Sergey Sharybin
1e107fa514 Merge branch 'master' into blender2.8 2017-10-25 10:13:35 +02:00
Brecht Van Lommel
fe253389e0 Fix Cycles gtests build on macOS. 2017-10-24 17:52:20 +02:00
Campbell Barton
ea606a7847 Merge branch 'master' into blender28 2017-10-06 21:25:33 +11:00