Commit Graph

170 Commits

Author SHA1 Message Date
Campbell Barton
e588e8e741 bugfix [#23257] cmake tests for SSE, but SSE2 gets enabled
patch from Vinay Pawar, some minor changes by me.
2010-08-11 08:23:48 +00:00
Campbell Barton
8902a4b2f1 [#23162] GCC 4.2 and prior support broken in CMakeLists.txt as of r30985
revert warning changes from r30985, broke with older GCC
2010-08-04 00:18:05 +00:00
Campbell Barton
957976882d build options to disable image formats WITH_CINEON, WITH_HDR.
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
2010-08-03 11:25:34 +00:00
Campbell Barton
7bd687ea58 cmake
- more strict warnings for gcc/unix, still <50 for a clean build.
- install files to /usr/local/share/blender/2.53 rather then /usr/local/share/blender/.blender
2010-08-02 16:23:58 +00:00
Campbell Barton
00149cfb9d patch [#23041] CMake WITH_PYTHON_INSTALL option
from Dan Eicher (dna)

--- snip ---
Adds the option to not copy python into the .blender/python directory.

Also fixes the problem of deleting the blender installed python where the blender runtime only looks for the copied python and not the system one but not entirely sure why, something to do with CMake hardcoding the PYTHONPATH and PYTHONHOME vars I suppose.

This patch only applies to the 'UNIX AND NOT APPLE' platforms but, then again, those are the only ones anyone really
cares about...or at least the only ones where using the system python is really viable.
2010-07-26 23:16:21 +00:00
Campbell Barton
1bb789956d CMake patch from Ralf Hölzemer (cheleb)
[#22849] Fix cmake install target on linux
--- from the tracker ---
This patch fixes the install target for the linux platform. Since the new configuration path changes are in effect, files have to be installed in the correct places instead of just copying the local installation to $PREFIX/share/blender.

It also provides a new macro to determine the correct blender version values.

Changes in this patch include:

- the .desktop menu file is installed in $PREFIX/share/applications and points to the svg icon instead of a png one, which is also installed in $PREFIX/share/pixmaps
- docs are installed in $PREFIX/share/doc/blender
- scripts are installed in in $PREFIX/share/blender/x.xx/
- locales are installed in in $PREFIX/share/blender/x.xx/datafiles
- a new cmake macro determines and sets the correct values for BLENDER_VERSION_MAJOR, BLENDER_VERSION_MINOR, BLENDER_SUBVERSION, BLENDER_VERSION, BLENDER_MINVERSION_MAJOR, BLENDER_MINVERSION_MINOR, BLENDER_MINSUBVERSION and BLENDER_MINVERSION by parsing source/blender/blenkernel/BKE_blender.h and calculating major/minor values. This replaces the hardcoded value in the top CMakeLists file and is used by all platforms.
2010-07-14 20:26:46 +00:00
Campbell Barton
d4b04fac04 partial fix [#22846] GCC 4.4.1 support in Windows
Still getting error:
 Warning: .drectve `/DEFAULTLIB:"LIBCMT" /DEFAULTLIB:"OLDNAMES" ' unrecognized
2010-07-14 18:22:39 +00:00
Campbell Barton
d80d6e2812 re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config 2010-07-12 18:26:35 +00:00
Campbell Barton
0a11d4c81d [#22817] Beta patch for cmake-MinGW compilation no 2
ommit FORCE CFlags, else users cant change their cflags.
2010-07-12 09:55:41 +00:00
Brecht Van Lommel
efb58cdab9 Fix #22219: compile error with videotexture/libavutil and recent gcc,
need __STDC_CONSTANT_MACROS defined.
2010-07-07 15:24:06 +00:00
Brecht Van Lommel
6c0f3d052e Detect SSE building support with cmake, and moved setting the defines
out of the render mode cmake file into the main one. Should fix PPC
compile, and hopefully not break others.
2010-07-04 18:40:59 +00:00
Campbell Barton
37b4e2af77 cmake: disable openexr if its not found (rather then throwing an error) 2010-07-03 15:03:13 +00:00
Damien Plisson
ec770b7538 OSX: CMake and scons default settings updated to allow build with LCMS lib 2010-07-03 10:01:41 +00:00
Campbell Barton
0fa0d12ff0 fix for building with WITH_RAYOPTIMIZATION 2010-07-01 13:21:40 +00:00
Brecht Van Lommel
93238c3a3d Runtime detection of SSE support for raytracing. Also enabled rayoptimization
by default now on all platforms since it shouldn't crash anymore if SSE is
not there. If this breaks compilation on some platforms, please let me know.
2010-06-24 15:54:01 +00:00
Campbell Barton
d36da839b1 reverting own recent change to switch off RULE_MESSAGES since you cant see which files are rebuilding. 2010-06-09 06:21:07 +00:00
Campbell Barton
ab0d12a3b6 minor changes to cmake, main noticable change is to disable RULE_MESSAGES which gives less output with makefiles (easier to spot warnings). 2010-06-07 14:28:37 +00:00
Campbell Barton
d153c765bc CMake:
- WITH_LCMS added option, was supported in scons.
- commented web plugin option since its not maintained.
- some formatting changes and removed includes that are not needed for source/creator/CMakeLists.txt.
2010-06-06 13:32:58 +00:00
Nathan Letwory
a6d5f43ac8 * update CMake and SCons for the OpenCollada update (to r746).
- DocumentExporter changed due to function name change in API
  - no more UTF lib
  - enabled by default for win32

Note: debug libs will be added later, as well as 64bit windows libs.

For other platforms, get r746 of OpenCollada and build against that.
2010-06-06 00:33:59 +00:00
Campbell Barton
a836aad094 mingw/cmake ffmpeg works now, update for new openexr libs which removed IlmThread. 2010-05-30 15:55:16 +00:00
Dalai Felinto
c6bec43330 reverting previous commit from Mitchell. His commit went to the trunk instead of the branch :)
svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2010-05-29 21:31:57 +00:00
Mitchell Stokes
9d3157eed0 Reversing the last merge because I botched it. 2010-05-29 21:22:24 +00:00
Sergey Sharybin
28d3a17cf4 Updated openexr for MinGW 2010-05-29 18:28:01 +00:00
Campbell Barton
d86ad8e671 disable forcing mingw compiler flags (means you couldnt change them) 2010-05-29 11:36:33 +00:00
Campbell Barton
5aa1d2bb25 removed WIN32 definition for msvc last commit (to get mingw working)
added back definition as well as checking if some options need to be set.
2010-05-29 07:31:40 +00:00
Campbell Barton
40d7eac69e [#21842] Beta patch to restore cmake MinGW compilation
from Riakiotakis Antonis (psy-fi) 

with modifications.

notes:
- needed to remove quotes around filepaths for copying.
- WITH_JACK, doesnt link
- WITH_FFMPEG, doesnt build
- WITH_RAYOPTIMIZATION, gave an error for me. (no mmx support)
2010-05-28 21:25:23 +00:00
Andrea Weikert
1ba9766ab5 == CMake ==
* updated for new libtiff
* also disabled opencollada for now as it caused errors

Note:
* WITH_INTERNATIONAL is enabled although this setting crashes Blender when compiling the Debug target - seems to work for other people though? If you encounter problems, try disabling this.
2010-05-27 18:22:50 +00:00
Campbell Barton
bd3bd5dea5 if libtiff not found disable on unix. 2010-05-21 04:40:04 +00:00
Campbell Barton
418f1fcba8 libtiff working on linux & cmake again. 2010-05-21 04:23:33 +00:00
Matt Ebb
2be851c966 Blender TIFF support
* Removed dynamic linking libTIFF code and change it to static linking 
(built into the blender executable). Dynamic linking made things a 
fair bit more complicated and wasn't working at all before on OS X - 
the dylib didn't exist and wasn't being copied. Since TIFF is more heavily
depended upon now in Blender, it makes sense to make it less 'optional'
and more in line with other libraries.

I've updated both CMake and scons, and CMake on OS X/64bit works fine.
It's now up to other platform/build system maintainers to enable this for 
their respective platforms (Campbell will check it for linux). For windows,
and non-64bit osx, we need static libtiff libraries in /lib.

I've added options WITH_TIFF for CMake and WITH_BF_TIFF for scons,
so if blender won't build because of this, you should be able to disable 
these options until your build system has been updated.

* Bonus feature: while doing this, I added support for loading 16bit and 32bit 
per channel TIFFs - they get converted to Blender's float buffers. Handy for 
zbrush displacement maps!
2010-05-21 03:25:38 +00:00
Campbell Barton
46a40c9905 minor cmake changes
- only give quicktime option for apple and windows
- disable collada by default on non-apple-unix since its not in debian repo
2010-05-09 14:43:31 +00:00
Campbell Barton
ed4377faa7 replace referenecs to python 2.x 2010-04-20 15:46:28 +00:00
Campbell Barton
4d2bc9f907 mindrones reports cmake 2.4 doesnt work anymore, since 2.8 is current, bumping the minimum version requiired 2010-04-11 12:20:30 +00:00
Damien Plisson
939a83e347 OSX: CMake & scons update for Ogg/Vorbis/FLAC added support to lib SNDFILE
Note that you need to svn up the precompiled lib folder (darwin-*) too to be able to build with SNDFILE
2010-04-03 09:54:38 +00:00
Campbell Barton
391cc2d004 merge own commits into render branch into trunk since 27560
27562, 27570, 27571, 27574, 27576, 27577, 27579, 27590, 27591, 27594, 27595, 27596, 27599, 27605, 27611, 27612, 27613, 27614, 27623
2010-03-20 16:41:01 +00:00
Brecht Van Lommel
148985edf0 CMake: FFMPEG directory and libraries are now configurable. 2010-03-18 10:16:04 +00:00
Daniel Genrich
01939f8472 Win64: Enable OpenAL for cmake + win64 2010-02-22 23:34:45 +00:00
Damien Plisson
7777957521 OSX buildscripts update following ffmpeg precompiled libs update 2010-02-22 16:34:27 +00:00
Damien Plisson
1d5fe11a62 OSX/CMake : fix ffmpeg include path 2010-02-15 10:38:47 +00:00
Campbell Barton
081c1205a3 correct fsf address 2010-02-12 13:34:04 +00:00
Arystanbek Dyussenov
67c9fa4ba1 Updated OpenCollada section of cmake windows config. 2010-02-02 13:05:21 +00:00
Campbell Barton
3f93d27c4a cmake vars are not using _BF_ in var names. 2010-01-30 19:29:24 +00:00
Damien Plisson
62ebf87d85 OSX : update build scripts for updated openCollada libs + ray tracing optimization option in cmake
OpenCollada new version (721) lib has additional lib files to link with.

Added BF_RAY_OPTIMIZATION option in CMake (as the one in scons) for building SIMD optimized ray tracing code.
2010-01-30 19:07:48 +00:00
Arystanbek Dyussenov
1f863d0122 COLLADA branch: merge from trunk -r 25745:26429.
scons+vc build crashes on Blender start when BF_COLLADA is on, don't know why this happens.

Merging from trunk to get working vc project files, then will try to debug and locate the problem.
2010-01-30 14:12:51 +00:00
Arystanbek Dyussenov
6695334377 COLLADA branch: patch for importer from Sergey I. Sharybin to build against OpenCollada at revision 721. Thanks Sergey!
People who want to build this branch will need update their OpenCollada.

On Linux OpenCollada builds without patching. As usual I updated the build doc: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch#Building_the_COLLADA_GSoC_branch

A small change will be necessary in cmake and scons options on Mac and Windows: OpenCollada's libBuffer was renamed to libbuffer.
2010-01-23 17:33:40 +00:00
Nicholas Bishop
8bcf66e1d1 CMake:
* Added -Wno-unknown-pragmas to the cflags, silences warnings when OpenMP is diabled.
2010-01-20 03:46:28 +00:00
Erwin Coumans
7d2b40c862 undo previous cmake fixes, Benoit already fixed it in cmake/macros.cmake 2010-01-17 21:00:07 +00:00
Erwin Coumans
f50ec12d9f cmake fix broken OSX build: those openmp flags break OSX build, it might only work on other unixes that way 2010-01-17 20:25:28 +00:00
Erwin Coumans
55756719fb cmake fix for Windows: link OpenCollada <libraryname>_d.lib in debug builds and <libraryname>.lib in release builds
this prevents crashing at startup of Blender in debug builds with cmake.

See bugreport by Andrea in the mailinglist here:
http://www.mail-archive.com/bf-committers@blender.org/msg00668.html

Also enabled WITH_OPENCOLLADA in cmake by default so the feature gets tested. If other devs like to keep OpenCollada it disabled, please revert the ON to OFF again.
2010-01-17 19:34:01 +00:00
Arystanbek Dyussenov
1bca8389dd Merge from trunk -r 25003:25745. 2010-01-05 19:21:59 +00:00