Commit Graph

509 Commits

Author SHA1 Message Date
Campbell Barton
299ff91ea1 code cleanup: BKE_scene api naming.
also stop numpy from being found in /usr/include with cmake.
2012-05-05 14:33:36 +00:00
Campbell Barton
7f8643806d cmake - improved detection of numpy, now works for typical ubuntu installation.
numpy directory can be referenced manually with the advanced option PYTHON_NUMPY_PATH if needed.
2012-05-01 23:22:58 +00:00
Campbell Barton
80ca8f2792 disable numpy installing if not found 2012-04-30 14:51:40 +00:00
Brecht Van Lommel
1d8c798188 Cycles: support for motion vector and UV passes.
Most of the changes are related to adding support for motion data throughout
the code. There's some code for actual camera/object motion blur raytracing
but it's unfinished (it badly slows down the raytracing kernel even when the
option is turned off), so that code it disabled still.

Motion vector export from Blender tries to avoid computing derived meshes
when the mesh does not have a deforming modifier, and it also won't store
motion vectors for every vertex if only the object or camera is moving.
2012-04-30 12:49:26 +00:00
Campbell Barton
d113fd8ab7 WITH_PYTHON_INSTALL_NUMPY option for unix/cmake, just copies from site-packages. 2012-04-30 09:38:32 +00:00
Daniel Genrich
b6c1850fd3 Silence warning during DualCon compile: "Node *pointer[0];" gets MSVC compiler all exited and stuff. 2012-04-29 17:02:52 +00:00
Campbell Barton
bb4942c920 code cleanup: quiet msvc warnings 2012-04-27 03:01:27 +00:00
Campbell Barton
2700064c0a cleanup msvc build flags, many were included more than once.
also make use of C_WARNINGS, CXX_WARNINGS as other platforms do.
2012-04-27 02:29:37 +00:00
Campbell Barton
6e2cff8c9f rename WholeCharacter in C too, add pthreads include back for msvc which needs it. 2012-04-26 18:18:09 +00:00
Campbell Barton
b801c6098a remove pthread include for windows, after this was added I couldn't build anymore with mingw, gave and error with ./source/icons/winblender.rc 2012-04-26 17:56:21 +00:00
Antony Riakiotakis
75addcf233 Lower optimization settings for MinGW-w64. Full optimization causes artifacts with empties and gods know what else. Turned on -ftree-vectorize to match MSVC behaviour for 64bit. 2012-04-24 17:20:51 +00:00
Antony Riakiotakis
4e6590067d revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too 2012-04-24 16:14:23 +00:00
Antony Riakiotakis
749d284b49 MinGW-w64 enable full optimization for C++ too 2012-04-24 14:51:23 +00:00
Antony Riakiotakis
0db3c5f743 Remove mingw-w64 errors from loss of precision by converting 64bit pointers to ints. All cases found were harmless and the error behaviour could be turned off by the -fpermissive flag but I'd rather keep that off to detect any real problems should they arise. 2012-04-24 14:33:44 +00:00
Antony Riakiotakis
4782522379 Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications.
Thanks!
2012-04-24 12:57:58 +00:00
Antony Riakiotakis
b84cdafbb5 Add cycles support for MinGW-w64 2012-04-24 09:58:03 +00:00
Antony Riakiotakis
6859537679 Enable support for OpenEXR on cmake for MinGW64 2012-04-23 22:56:34 +00:00
Antony Riakiotakis
8b476d0275 First MinGW-w64 support for cmake has been added. To test I recommend this build:
http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/ray_linn/GCC-4.7.0-with-ada/mingw-w64-gcc-4.7.0-runtime-2.0.1-static-ada-20120330.7z/download

Other builds may also work but due to the constantly changing nature of the compiler this cannot be guaranteed. I often had to change compilers while building the libraries and this one is the one that did the job for most of them.

This first support is experimental and considered "advanced". To enable pass -DWITH_MINGW64 during cmake configuration. Also make sure to extract the compiler on C:/MinGW and that MinGW/bin is in your path. To build check out lib/mingw64.

Initially the support is lacking until I get every library compiled correctly. For now you should disable WITH_CYCLES(sorry, I know some people are dying to do benchmarks, but still a few libs to go), WITH_IMAGE_OPENEXR, WITH_OPENCOLLADA, WITH_LIBMV and WITH_CODEC_FFMPEG(links but hangs on startup).

Still the tools are working, the memory limit is increased and due to the experimental nature of the setup, full optimization with SSE2 is available, which makes the build quite fast. Also the compiler and especially, the linker are way faster than regular MinGW.

The wiki docs have also updated. Happy testing!
2012-04-23 20:09:59 +00:00
Antony Riakiotakis
c498c0eb42 Update build files to use the new lib locations for MinGW. For builders: you will need to checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/mingw32/
to build with MinGW past this commit.
2012-04-23 01:11:42 +00:00
Antony Riakiotakis
ff06260ea1 Solve restriction of MinGW that users have to turn ffmpeg on for cmake. 2012-04-22 14:33:40 +00:00
Jens Verwiebe
69d0a68f0d OSX/cmake: LESS must be VERSION_LESS for XCODE_VERSION 2012-04-22 11:23:17 +00:00
Campbell Barton
e533fe72a3 fix incorrect use of PLATFORM_DEFAULT with cmake 2012-04-15 09:51:30 +00:00
Campbell Barton
a8077c8222 disallow invalid mingw configurations, not just disable by default but disallow the built to run if they are set by the developer. 2012-04-15 07:32:56 +00:00
Antony Riakiotakis
9e68c3cb3f Hrm...parse error from previous commit 2012-04-14 22:21:50 +00:00
Antony Riakiotakis
8d665ccdcc Fix linking issue with MinGW. For some reason ffmpeg needs to be enabled. Some kind of bizarre linking order issue seems to be the case but since it touches so many areas of the code I prefer to simply enable by default. 2012-04-14 21:26:50 +00:00
Antony Riakiotakis
20f446073c Took out OpenMP refactor out by mistake 2012-04-12 08:45:26 +00:00
Antony Riakiotakis
14c527a419 Revert changes that disable features on MinGW.
To compile on MinGW it is important to have the latest MinGW (gcc 4.6.2)

I have updated the instructions on the wiki to reflect this:  http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Windows/Environment
2012-04-12 08:36:07 +00:00
Campbell Barton
8660a20049 cmake/mingw now builds with default configuration (needed to disable tiff/exr/cycles) 2012-04-12 05:34:17 +00:00
Campbell Barton
d5953568c8 use 'const float[3]' for derived mesh callback args. 2012-04-09 07:06:06 +00:00
Campbell Barton
37f9d52486 dont disable python when addons aren't found (addons are not needed for python to run) 2012-03-17 18:33:51 +00:00
Bastien Montagne
788b47b788 Fix for yesterday i18n own commit (r44924): we now need to define WITH_INTERNATIONAL everywhere TIP_/IFACE_ macros are used (else, we get non-international, dummy NOP macros instead!).
Also fixed in main CMakeList file, when no addon dir found, we want to disable WITH_PYTHON (I guess, certainly not WITH_INTERNATIONAL ;) ).
2012-03-17 12:07:58 +00:00
Jens Verwiebe
4022c52cfa OSX/cmake: move the xcode 4.3 warning up, it was not shown due error happened before, masking it 2012-03-15 15:32:56 +00:00
Jens Verwiebe
23c1edb777 OSX/cmake: enable clang compiler with xcode >= 4.3, tested o.k.now 2012-03-14 23:42:46 +00:00
Jens Verwiebe
639cf31f8a Avoid a sigsev after 44830 when reports is empty, clang compile work 2012-03-14 12:03:49 +00:00
Campbell Barton
f80fa54428 documentation edit to address bmesh py api bug [#30453]
warn when addons are not found when running cmake.
2012-03-14 00:30:20 +00:00
Campbell Barton
489526477c print warning when release/datafiles/locale is missing when building with cmake (git-svn causes this). 2012-03-13 22:27:21 +00:00
Campbell Barton
59303e35fc WITH_GHOST_SDL working again (missing std:: update) 2012-03-13 14:28:58 +00:00
Campbell Barton
2fbb5ce833 bmesh py api: more comprehensive intro page, also fix some spelling errors. 2012-03-13 06:22:43 +00:00
Jens Verwiebe
cd2d2f2f4e OSX/cmake: use again 10.5 as general deployment target ( pls verify 10.5 compatibility works with automatic weaklinking), use now then sdk which for sure exists, remove obsolete slash 2012-03-12 12:03:52 +00:00
Sergey Sharybin
42b3463030 Bundle new upstream version of libmv from own branch
This version of libmv includes new gflags and glog libraries which makes
it possible to compile libmv with clang compiler.

Also remove code from CMakeLists which was disabling libmv if using clang.

Tested on linux with gcc-4.6 and clang-3.0, windows cmake+msvc and scons+mingw.
Could be some issues with other platforms/build system which shall be simple to resolve.
2012-03-11 19:52:25 +00:00
Jens Verwiebe
24ea07154e OSX/cmake: added a comment on method used 2012-03-10 16:39:51 +00:00
Jens Verwiebe
3658389e72 OSX/cmake: ensure newest Xcode compatibility, important: still needs a patched cmake ( see error you will get if missed ), patched cmake provided here: http://www.jensverwiebe.de/Blender/CMake%202.8-7patched.zip 2012-03-10 16:21:48 +00:00
Campbell Barton
729ddf51b7 revert r44503, (left patch file in for now), this gives an error with gcc:
extern/libmv/third_party/glog/src/utilities.cc:318: error: undefined reference to 'google::InstallFailureFunction(void (*)())'
2012-02-28 05:50:02 +00:00
Antony Riakiotakis
b6582ff8fa Change boost librarie names for MinGW to use the recently added libraries 2012-02-26 09:28:06 +00:00
Campbell Barton
c955272ec5 code cleanup
* correct cmake/clang warning.
* use same include guard names as everywhere else for BLI math inline.
* correct define for madd_sh_shfl
2012-02-25 09:02:05 +00:00
Brecht Van Lommel
d47b018f8d Fix #30270, #30265: cycles not displaying textured objects, and not rendering
text/curve objects after the bmesh merge. Also removed a debug print.
2012-02-21 14:39:59 +00:00
Brecht Van Lommel
0b54887f71 Fix cmake warning on Mac, when not using Xcode generator. 2012-02-20 14:19:45 +00:00
Sergey Sharybin
9def83f7e0 XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons
Disabled on FreeBSD platforms due to some linking errors.
2012-02-17 20:51:39 +00:00
Sergey Sharybin
29f0ff718b Reverting changes made to build systems when was upgrading OpenAL.
Reverting to openal from creative because own builds doesn't deal with 3D sound.
Hopefully it wouldn't lead to crashes caused by ffmpeg+openal (for resolving which
libraries were updated to openal-soft).
2012-02-17 16:58:34 +00:00
Campbell Barton
1f3df9e659 patch from Jochen Schmitt to get blender building with gcc4.7 2012-02-09 07:01:30 +00:00