Commit Graph

490 Commits

Author SHA1 Message Date
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
Campbell Barton
45155785e3 own attempted simplification to previous patch was incorrect. 2012-02-02 11:12:41 +00:00
Campbell Barton
2c5d936c3a patch from Peter Stern to fix CMake building on OSX (without manual editing of configuration) 2012-02-02 11:08:48 +00:00
Jens Verwiebe
9e62a52509 OSX/Cmake: make bpy module work finally by linking against python3.2 framework 2012-01-16 20:10:38 +00:00
Sergey Sharybin
e81f2853c8 Carve booleans library integration
==================================

Merging Carve library integration project into the trunk.

This commit switches Boolean modifier to another library which handles
mesh boolean operations in much stable and faster way, resolving old
well-known limitations of intern boolop library.

Carve is integrating as alternative interface for boolop library and
which makes it totally transparent for blender sources to switch between
old-fashioned boolop and new Carve backends.

Detailed changes in this commit:

- Integrated needed subset of Carve library sources into extern/
  Added script for re-bundling it (currently works only if repo
  was cloned by git-svn).
- Added BOP_CarveInterface for boolop library which can be used by
  Boolean modifier.
- Carve backend is enabled by default, can be disabled by WITH_BF_CARVE
  SCons option and WITH_CARVE CMake option.
- If Boost library is found in build environment it'll be used for
  unordered collections. If Boost isn't found, it'll fallback to TR1
  implementation for GCC compilers. Boost is obligatory if MSVC is used.

Tested on Linux 64bit and Windows 7 64bit.

NOTE: behavior of flat objects was changed. E.g. Plane-Sphere now gives
      plane with circle hole, not plane with semisphere. Don't think
      it's really issue because it's not actually defined behavior in
      such situations and both of ways might be useful. Since it's
      only known "regression" think it's OK to deal with it.

Details are there http://wiki.blender.org/index.php/User:Nazg-gul/CarveBooleans

Special thanks to:

- Ken Hughes: author of original carve integration patch.
- Campbell Barton: help in project development, review tests.
- Tobias Sargeant: author of Carve library, help in resolving some
                   merge stoppers, bug fixing.
2012-01-16 16:46:00 +00:00
Kent Mein
9dc992a3fd Some small fixes to get things compiling on solaris with cmake.
There are also some changes that need to be done to libmv but I'm 
leaving those out so I can get it patched upstream first.

(Only works with gcc/g++ if we want to use sun's compiler we would need
to get rid of all of our annonymous structs which I don't think
we want to do at this point, example:

typedef struct wmNDOFMotionData {
        union {
                float tvec[3]; // translation
                struct { float tx, ty, tz; };   // this would need to be fixed
		// something like this or something similar:
                struct { float x, y, z; } t;
                };
...
)

Kent
2012-01-12 16:31:27 +00:00
Campbell Barton
8b59efe129 ../lib/linux wont built with theoraenc theoradec unbuntu user also complained that this failed to link.
Im not sure whats best default here, removing for now.

if it gives more problems we could have a FindTheora module.
2012-01-12 15:56:08 +00:00
Alex Fraser
dcef7346eb Added mode-getting functions for GHOST under X11 (GNU/Linux).
Enabled xvidmode by default in cmake.
Patch approved by Campbell.
2012-01-11 12:28:31 +00:00
Campbell Barton
68fd186586 use warnigns for all msvc configurations 2012-01-06 05:13:36 +00:00
Campbell Barton
8a9650e620 disable recent attempt to static link mingw DLL's causes errors for some users.
also remove break statement, mistake on last commit.
2012-01-05 10:05:24 +00:00
Campbell Barton
b5ce2b028a link mingw libstdc++ and libgcc libs statically so users dont need mingw installed to use mingw builds 2012-01-05 07:52:03 +00:00
Alex Fraser
c2bb285750 Mode switching for GHOST under X11: adds the ability to change screen resolutions in the blenderplayer on GNU/Linux.
Code ported from Quake 2.
2012-01-02 12:25:14 +00:00
Tom Musgrove
af54c83d28 left out one tiny word... 2012-01-01 22:23:08 +00:00
Tom Musgrove
ab4a93f2bc part of line missing in Jens commit, this fixes compile on non Apple platforms, thanks to Lockal in IRC for pointing it out 2012-01-01 21:19:40 +00:00
Jens Verwiebe
47cb54195d OSX: fix compile by conditional unsupported flags 2012-01-01 16:46:08 +00:00
Campbell Barton
ba8d1b940f option to build without remesh modifier for cmake and scons 2011-12-31 03:34:44 +00:00
Alexander Kuznetsov
4b9457dd4a Patch is partially made by Pelle Johnsen. Thanks!
This patch enables search for specific libraries for vc2010 using "set_lib_path" macro
If *x* library or path exists in lib/win___/vc2010/*x* , vc2010 will use it. If not, compiler will use standard libraries.
It can be easily extended to gcc.

The function is enabled for:
openCollada
openExr
Python
openImageIO

The different libraries are needed for different compilers because C++ was used. There is no standard for lib's C++ structure/functions' names.

Actual libs will follow
2011-12-30 22:10:48 +00:00
Sergey Sharybin
a0e62e77d7 Update build files to use new OpenAL libraries 2011-12-27 09:37:19 +00:00
Antony Riakiotakis
84c8fde2ae Re-enable CYCLES and OpenEXR since they work for MInGW. IMPORTANT: Only use the latest MinGW to compile blender. 2011-12-24 11:56:13 +00:00
Campbell Barton
da3dd4de20 give errors when using unsupported configurations with mingw` 2011-12-23 07:37:51 +00:00