bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
42,176 Commits 2 Branches 0 Tags 745 MiB
76288fad8c
Commit Graph

594 Commits

Author SHA1 Message Date
Lukas Toenne
3b3ad5bba6 Fix for cmake syntax error: LLVM_VERSION string was not configurable, causing linker errors for people not using the default LLVM version (3.0 on Linux, 3.1 on OSX). 2012-10-25 14:31:52 +00:00
Campbell Barton
226a5ee834 remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also remove CTR c++ classes that are no longer used. 2012-10-22 02:39:26 +00:00
Campbell Barton
f3ece5a108 style cleanup: trailing tabs & expand some non prefix tabs into spaces. 2012-10-21 05:46:41 +00:00
Bastien Montagne
c1b39d3461 Fix for r51447 (my CMake 2.8.9 did not like it, looks like with quotes it suites it...). 2012-10-20 19:36:08 +00:00
Campbell Barton
a9e2e22797 dont ise -Wuninitialized on gcc 4.2 and older, it gives annoying warnings. 2012-10-20 13:29:07 +00:00
Campbell Barton
cf7dec94fe switch order cmake includes warning flags so its possible to disable them 2012-10-20 13:08:51 +00:00
Brecht Van Lommel
3abef3a2e6 Cycles OSL: some build system tweaks to avoid global includes and definitions, 
which ensures there is no conflict with other libraries, and avoids full rebuild
when toggling OSL on/off.
 2012-10-20 12:17:45 +00:00
Jens Verwiebe
1e448fa3e2 OSX/cmake: after osl librenew with globals patch, forcing oiio is not longer needed 2012-10-11 10:15:37 +00:00
Campbell Barton
aa1e50be94 add option to build without blenders default avi codec. 2012-10-08 02:51:42 +00:00
Jens Verwiebe
e7db06ad9d Force USE_QTKIT for osx 64bit 2012-10-06 18:53:57 +00:00
Lukas Toenne
868df3525e Fix for WITH_LLVM cmake option: When using WITH_CYCLES_OSL this option is forced ON, but this change was not cached yet. Thanks to Jens Verwiebe for providing this fix. 2012-10-06 18:40:05 +00:00
Lukas Toenne
2ecb4781a7 Fix for incomplete loading of liboslexec static library. This is needed in order to provide the osl_allocate_closure_component function for LLVM. 2012-10-06 14:35:48 +00:00
Lukas Toenne
a2d8cf333f Better support for LLVM linking, needed for static OSL library. 
This adds cmake code for LLVM on linux and updates the cmake code used for OSX.
LLVM is linked like other external libraries now, by using the setup_liblinks and setup_libdirs macros instead of the PLATFORM_LINKFLAGS variable.
The use of llvm-config for getting a list of libraries can also be simplified quite a bit.

Caching the LLVM_DIRECTORY and LLVM_VERSION strings could be nicer though.
 2012-10-06 11:00:45 +00:00
Jens Verwiebe
7be70c746c OSX/cmake: fix warning: go back to initial state, not the right way to get rid of this 2012-10-04 11:37:17 +00:00
Jens Verwiebe
ae3c28481b OSX/cmake: fix warning: second try 2012-10-04 11:26:02 +00:00
Jens Verwiebe
a273d45a5d OSX/cmake: fix warning: -Wuninitialized is not supported without -O, in debug-mode 2012-10-04 10:48:17 +00:00
Campbell Barton
9e0a1b613f fix for cmake constructing an invalid include path. 2012-10-03 05:49:22 +00:00
Brecht Van Lommel
e5faa314f2 CMake: disable some warnings on mac that cause prints in nearly every file, and 
remove duplicate -Wundef entries.
 2012-10-01 16:45:50 +00:00
Jens Verwiebe
77b90a94c9 OSX/cmake: simplificate compile conditions and silence lot of CLANG warnings 2012-10-01 14:03:02 +00:00
Campbell Barton
589ada7f0c code cleanup: correct spelling 2012-09-28 06:45:20 +00:00
Campbell Barton
aa49ca25d5 incorrect spelling in comments 2012-09-26 20:05:38 +00:00
Jens Verwiebe
29ad5fc5e8 fix osx/ols compile after #50876 2012-09-25 18:30:37 +00:00
Alexander Pinzon
38b93b968c Unification of names for the BOOST library directory in Windows 32 and win64 2012-09-25 15:27:11 +00:00
Alexander Pinzon
c0a7773ccf Boost directories were not properly configured to vc2010. 
Opencolorio directories and openimageio not work as you would expect macro
 2012-09-25 15:11:34 +00:00
Jens Verwiebe
3d6e2c2af6 fix cmake in case the boostlibs don't contain boost_python3 refactor ( was possibly not correct) 2012-09-24 20:37:18 +00:00
Jens Verwiebe
71a3339032 fix cmake in case the boostlibs don't contain boost_python3 yet 2012-09-24 19:53:33 +00:00
Jens Verwiebe
87a8aea313 OSL/cmake: the non-intrusive parts, so other os-maintainers can take code over 2012-09-24 19:06:28 +00:00
Campbell Barton
be2454dc55 add back -Wundef for g++, also correct clang warnings and add -Wunused-macros warning. 2012-09-20 09:19:49 +00:00
Campbell Barton
ff834242b7 ffmpeg was adding an include just incase, without a cmake find module here - just check if the dir exists. 2012-09-20 07:43:48 +00:00
Campbell Barton
25c96bc9f3 code cleanup: remove unused macros, commet some which may be useful later - or good to keep for completeness. quieted some warnings and add flags -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc 2012-09-20 01:02:39 +00:00
Antony Riakiotakis
2e3d044cd9 -Wnonnull flag is not for C++. I think we all know it by now, time to 
get rid of it.
 2012-09-18 14:17:10 +00:00
Campbell Barton
6df4c1317f code cleanup: use system includes for cmake, otherwise warnings get printed in headers. 2012-09-18 04:40:20 +00:00
Antony Riakiotakis
3968b63735 * Enable opencolorio for scons/mingw32 (coming very soon) 
* Change names of libraries for mingw32 boost to 1.49
 2012-09-16 20:26:28 +00:00
Campbell Barton
e84b300d9e use the format attribute in more places, disable X11 options when building with GHOST_SDL 2012-09-16 10:39:19 +00:00
Campbell Barton
c2a1dcf621 fix for error in recent commit (made function static that shouldn't have been), add extra gcc warnings to cmake. 2012-09-16 01:35:00 +00:00
Sergey Sharybin
b93da9b01e Color Management, Stage 1: Initial OpenColorIO library integration 
This commit integrates support of OpenColorIO library into build systems.

It also contains C-API for OpenColorIO library which could be used by Blender.

CMake has got find rules familiar to OpenImageIO's one which makes it easier
for build system to find needed libraries and includes. Scons only could use
explicitly defined paths to libraries and includes.

C-API would be compiled and Blender would be linked against C-API and OpenColorIO
but it wouldn't affect on Blender behavior at all.

OpenColorIO could be disabled by setting up WITH_OCIO to Off in CMake and
setting WITH_BF_OCIO in Scons.
 2012-09-15 10:03:17 +00:00
Campbell Barton
e75f5c8208 quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc. 
helps for finding unused functions and making functions static, also did some minor code cleanup.
 2012-09-15 01:52:28 +00:00
Sergey Sharybin
c2b9150db2 Disable legacy compositor by default 2012-09-14 15:21:56 +00:00
Lukas Toenne
f7a5569a97 OSL cmake cleanup: 
* Removed unused lib and include directories (also one bad 'src' include that wouldn't work anyway)
* Copied cmake library finding to APPLE and WIN32 sections. These may need some adjustment for their respective OS.
 2012-09-10 08:38:51 +00:00
Lukas Toenne
1352a955ca Cleanup for OSL linking in cmake: Move cmake OSL library search and path definition from the cycles macro file to the top-level CMakeLists.txt. This makes the OSL_LIBRARIES and other variables accessible throughout Blender cmake scripts and especially in the creator module for linking libraries. 2012-09-10 06:18:20 +00:00
Antony Riakiotakis
3793e178f4 Turn OpenMP off for MinGW64. I thought it behaved correctly in new compiler builds but unfortunately it looks like there is some issue still which mostly shows when openmp threads stop. This causes crashes after rendering with subsurf, multires, when calculating fluids and possibly when other functionality is used as well. 
This should make MinGW64 builds quite stable again :)
 2012-08-22 00:06:09 +00:00
Campbell Barton
455c37c16b option to build without the legacy compositor 2012-08-19 22:19:19 +00:00
Campbell Barton
47e313ec0c cmake option to build without iksolver 2012-08-18 13:36:29 +00:00
Thomas Dinges
b174610a84 Cmake / Windows: 
* Fix for Boost lib dir when using msvc 2010.
 2012-08-14 19:13:47 +00:00
Thomas Dinges
211d30ea7f Cmake / Windows: 
* Fix for Python include path when using msvc 2010.
 2012-08-14 16:53:40 +00:00
Thomas Dinges
6e939eb2ec Cycles / Cmake: 
* When CUDA building is enabled, build sm_30 kernel as well.
 2012-08-09 12:08:35 +00:00
Jens Verwiebe
17fdc45437 OSX/cmake: refactoring of setting endianess defines, this fixes compile of builds with endianess other than the buildmachine and avoids also failing configuration with xcode 4.4 due not supporting big_endian archs anymore 2012-08-07 13:51:19 +00:00
Jens Verwiebe
9ee3a8655f Fix for fix, now nested 2012-08-07 12:09:48 +00:00
Jens Verwiebe
d4029de0d6 Fix for endiantest, xcode condition interferred with other os 2012-08-07 12:03:43 +00:00
Jens Verwiebe
b9c441536c OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo: deployment target management 2012-08-07 10:02:34 +00:00