Commit Graph

270 Commits

Author SHA1 Message Date
Brecht Van Lommel
49db2d18b2 Disable rayoptimization again on MinGW, it crashes. 2010-06-24 18:12:59 +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
6cc6f8495f - added a flag argument to WM_operator_properties_filesel() currently only used for relative path option.
- added relative option to saving external multires data
- renamed multires external functiosn to have save / pack as suffix.
- added TODO's for file select operators that should support relative paths but dont.

- also disable openmp on linux cross compile, mingw currently isnt linking -lgomp
2010-06-09 14:04:34 +00:00
Nathan Letwory
0cc077ec45 Update config file for win64 for OpenCOLLADA (r746) 2010-06-06 00:58: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
Nathan Letwory
9ba5c24d01 Change to liblibjpeg, otherwise mingw looks for jpeg.lib instead of libjpeg.lib 2010-06-05 10:15:48 +00:00
Nathan Letwory
35ea04cfc7 MingW (both native and cross) now use the libjpeg.lib from lib/windows. This is the compiled version from Sergey committed at r29226 (so please update your lib/windows too) 2010-06-04 23:38:17 +00:00
Campbell Barton
eb5f310e05 remove cruft from scons config. 2010-06-04 07:17:12 +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
Sergey Sharybin
2d450c9e58 Changed BF_TIFF_LIB from libtiff to tiff for MinGW 2010-05-24 16:07:17 +00:00
Sergey Sharybin
4324dc8389 Changes for static linking to libtiff when compiling by MinGW:
- Use static tiff libraries from lib/windows/gcc in
  scons configuration files
- Commented libtiff.dll installation in SConstruct
2010-05-24 12:41:14 +00:00
Sergey Sharybin
735559f0da Fixes for cross-compilation:
- Set env['CC'] and env['CXX'] as default values for
  CC and CXX variables. This fixes problem with overwriting
  auto-guessed compilators when reading config files
- Added new prefix for mingw tools
2010-05-23 21:20:13 +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
ed4377faa7 replace referenecs to python 2.x 2010-04-20 15:46:28 +00:00
Peter Schlaile
f05a7e70b2 This fixes largefile (> 4GB) problems in Linux.
(File browser showing negative file sizes, etc.)
2010-04-18 17:26:37 +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
Jens Ole Wund
485c26578c would not want to wait for 'that' on every build
MS scons win32  skip calling makebsc by default
2010-04-01 23:58:12 +00:00
Tom Musgrove
843a932b4a confirmed with multiple people that Collada builds fine with mingw win32 on scons. So setting it back to true by default. 2010-03-12 20:08:13 +00:00
Brecht Van Lommel
a19e542db2 Bug #20410: collada doesn't compile with mingw but is enabled by default. Since
no one seems to be fixing this I've just disabled it by default now.
2010-03-12 16:32:18 +00:00
Daniel Genrich
8a31fab304 Win64: Bugfix for non working scons, thanks to matd for the fix!
jesterKing: please check if the win32 dll's aren't needed anymore. Seems that they are compiled into ffmpeg, right?
2010-02-22 22:56:28 +00:00
Daniel Genrich
a7d606a2ff Win64: Bugfix for missing include, reported + fixed by matd, thanks 2010-02-22 22:17:14 +00:00
Damien Plisson
7777957521 OSX buildscripts update following ffmpeg precompiled libs update 2010-02-22 16:34:27 +00:00
Joerg Mueller
b896a007ea Scons fixes:
- Removing alut
- Minor changes in linux ffmpeg default config.
2010-02-18 15:59:20 +00:00
Damien Plisson
ea69d2d37a OSX/Scons cleanup : remove option to build with extern/ffmpeg and old python 2.5 options 2010-02-15 10:10:30 +00:00
Peter Schlaile
cc948f13c0 == FFMPEG ==
Made using system's ffmpeg the default now. (First step in removing
ffmpeg from extern)
2010-02-14 18:52:27 +00:00
Arystanbek Dyussenov
65d533bc77 scons linux config: only BF_OPENCOLLADA needs to be user-set, BF_OPENCOLLADA_INC is derived. 2010-02-11 08:47:33 +00:00
Damien Plisson
bed4c49a79 OSX/scons : fine tune Intel archs optimization flags 2010-02-10 13:25:50 +00:00
Tom Musgrove
f2a8bb3498 this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit 2010-02-01 18:39:41 +00:00
Damien Plisson
93b643ecc7 OSX : fix OpenCollada build for 10.4 targets with scons 2010-02-01 10:14:22 +00:00
Tom Musgrove
caf067576e changes to get MingW compiling and cross compiling working, patch by Sergey Sharybin 2010-01-30 22:46:25 +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
0c899f7ded Merge -c 26209,26214,26443 from COLLADA branch into trunk. 2010-01-30 18:20:56 +00:00
Arystanbek Dyussenov
8597925736 COLLADA branch: updated vc9 project files and w32 scons config. 2010-01-30 18:03:18 +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
Campbell Barton
886a5bca08 set to python 3.1 in scons config. 2010-01-19 21:42:01 +00:00
Campbell Barton
530b8bba42 patch [#20612] Making Blender compile on AIX 4.3.3
from Philipp Gühring (sourcerer)
2010-01-19 10:57:59 +00:00
Damien Plisson
dc589a33dd OSX/scons : fix cross-build issue during linking phase with dynlibs 2010-01-18 14:08:40 +00:00
Arystanbek Dyussenov
1bca8389dd Merge from trunk -r 25003:25745. 2010-01-05 19:21:59 +00:00
Damien Plisson
e1f3824547 OSX / Scons : set MACOSX_DEPLOYMENT_TARGET env var to allow builds for older systems 2009-12-23 15:56:00 +00:00
Nathan Letwory
11af0ff270 * WITH_BF_RAYOPTIMIZATION cleanup and flag separation by matd.
This adds BF_RAYOPTIMIZATION_SSE_FLAGS through which one can manage
  what SSE flags are best for the platform built for.

  Note that the ray optimizations coded by jaguarandi are SSE-intrinsics only.
2009-12-10 00:51:13 +00:00
Nathan Letwory
5438440483 * enabled COLLADA for mingw. (Compiles at least with MingW GCC 3.4.2). 2009-12-05 01:24:45 +00:00
Damien Plisson
59ae9d855d Mac: Following 10.4 ppc libs availability, update cmake & scons default settings 2009-12-02 18:06:39 +00:00
Nathan Letwory
5a3791ab5b Apply patch [#20145] Ghost Win32 roundup patch: Minimum Window Size, Continuous Grab and Drag And Drop
This nice patch by Matt D. (matd in #blendercoders) adds three nice features that can be seen already in the other supported OSes:

* minimum window size: to prevent some bugs with the window manager of Blender, system windows cannot be resized smaller than the minimum size.

* Continuous Grab is finally in Windows! Default settings since alpha 0 already have the feature enabled by default, so grab a new build and enjoy :)

* GHOST support for drag and drop added. This prepares Blender for drag and drop from OS -> Blender. Currently not very useful, since wm needs to be readied for that. But it does work (do BF_GHOST_DEBUG=1 build and drag a file onto a Blender window).

Thanks Matt D.!
2009-12-02 00:57:12 +00:00
Damien Plisson
bd8f50234f Mac scons config: enable cross-compile, set 10.4 as default for ppc (using darwin-8.0.0-powerpc libs), set opencollada not to be built by default 2009-12-01 11:19:18 +00:00
Arystanbek Dyussenov
92b4316708 Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail. 2009-11-29 19:16:52 +00:00
Arystanbek Dyussenov
8512013536 COLLADA branch: merge from trunk -r 24522:24758. 2009-11-22 13:51:29 +00:00
Campbell Barton
b895b2e48f - remove CPPFLAG XP_UNIX from CMake, Scons and Irix make, checked our own code and /usr/include, its only used in our netscape plugin.
- CMake on unix default OpenMP to enabled.
- Scons on linux default OpenMP to enabled.
- copying python is slow, for scons only copy if the directory has not been created.
2009-11-19 11:49:42 +00:00