sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
36,970 Commits 2 Branches 0 Tags 753 MiB
51c553befb
Commit Graph

131 Commits

Author SHA1 Message Date
Antony Riakiotakis
d184fe0df3 Missed Scons update for MinGW boost 2012-02-26 16:54:20 +00:00
Jens Verwiebe
f8d55b5bf0 OSX: scons: fix own mistake, truncate output of xcode-build -version to major.minor version in config to change the var not only the print 2012-02-25 11:21:20 +00:00
Jens Verwiebe
2377bfe32f OSX: set ffmpeg back in darwin-config according librenaming 2012-02-24 18:31:09 +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
Jens Verwiebe
c9d8af6cff OSX: since XCode 4.3 the developer directory is inside XCode.app bundle, so we handle path according XCODE_VERSION now 2012-02-17 10:44:21 +00:00
Jens Verwiebe
441dc0fc7e OSX: to make transition for mediaimports to ffmpeg reliable, ffmpeg_0.10 is mandatory 2012-02-14 07:47:29 +00:00
Sergey Sharybin
33bca3075f Fix for hardcoded to scons rules python abi flags and wrong behavior 
of python bundling on systems where python is installed to /usr/lib64

Now ABI flags are automatically detecting (by checking all available flags
and checking if there's include directory exists for flag).
Also, automatically set PYTHON_LIBPATH to /usr/lib64 if python
scripts are stored in this folder.
Bundling python on *nix platforms is now checks if python is installed
to lib64 directory and if it is, python will be bundled to lib64
folder instead of lib.

This will make building on openSUSE a bit less annoying
 2012-02-08 17:17:19 +00:00
Campbell Barton
8391f534ab remove WITH_OGG define, its not used anywhere. 2012-01-10 13:33:53 +00:00
Campbell Barton
68fd186586 use warnigns for all msvc configurations 2012-01-06 05:13:36 +00:00
Joshua Leung
f6c5744b01 Bumping up scons+msvc warning level to w1 so that we at least get some warnings 
out of it.
 2012-01-06 04:07:09 +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
Alexander Kuznetsov
28e658a386 Openexr path change for scons (win) 2011-12-31 17:15:47 +00:00
Joshua Leung
fc74eea7a4 Mingw - use truly relative instead of absolute-relative paths for Boost and OIIO 
That is, instead of '#../lib/windows/lib_name/include', we're now using BF_LIBNAME + '/include'. This makes it possible to have a single lib folder shared between several local working trees again.
 2011-12-29 02:57:41 +00:00
Sergey Sharybin
a0e62e77d7 Update build files to use new OpenAL libraries 2011-12-27 09:37:19 +00:00
Thomas Dinges
b66c87231a * Changes for static win32 png libs. 2011-12-19 19:46:07 +00:00
Thomas Dinges
0ebb1a3f9f * Fix for moving mingw png libs. 2011-12-19 14:46:17 +00:00
Thomas Dinges
8f0e9c7c09 MinGW png libs 
* Moved to gcc/png in the libs dir.
 2011-12-18 23:23:09 +00:00
Jens Verwiebe
94bc2b0cff OSX: proper scons config and linking weak for jackOSX and errorhandling 2011-12-12 22:17:02 +00:00
Thomas Dinges
12326ac6c5 CUDA 
* Added CUDA Binaries to Windows scons config files, disabled by default. 
Also the path to nvcc is commented out, best to set this in the user config, as it varies on each system probably.
 2011-12-04 10:45:25 +00:00
Brecht Van Lommel
45de380771 Cycles 
* Compile all of cycles with -ffast-math again
* Add scons compilation of cuda binaries, tested on mac/linux.
* Add UI option for supported/experimental features, to make it
  more clear what is supported, opencl/subdivision is experimental.
* Remove cycles xml exporter, was just for testing.
 2011-12-01 16:33:21 +00:00
Campbell Barton
d9e99abe37 hide overly picky warnings from 'pylint' for pep8 script, indentation edits. 2011-11-19 16:17:35 +00:00
Sergey Sharybin
df6aa48eb9 Fixed typo in previous commit 2011-11-15 09:21:22 +00:00
Sergey Sharybin
5cf345f860 Request from nico_ga: expose WITH_BF_STATIC* variables to linux-config so 
builders can easily find interesting for them flag.
 2011-11-15 08:43:23 +00:00
Joshua Leung
36c073ab2a mingw compiles again after OceanSim stuff 2011-11-14 10:35:11 +00:00
Jens Verwiebe
ea38cb2e5e Scons_buildsystem: add WITH_BF_OCEANSIM = True to all configs 2011-11-13 15:10:54 +00:00
Brecht Van Lommel
0f85990d4a Cycles: more linux build system tweaks, attempting to avoid using boost 
system libraries by default if we have a lib/ directory.
 2011-11-11 20:57:00 +00:00
Brecht Van Lommel
38fd8c0e22 Cycles: fix wrong openimageio path for lib/ directory. 2011-11-11 19:20:52 +00:00
Brecht Van Lommel
a7f09ea0b2 CMake/Scons: automatically use ffmpeg, boost and openimageio from the svn lib/ 
directory if available, which should make building with ffmpeg and cycles easier.

If this folder is not available or another path is specified in user-config.py
or CMakeCache.txt, this should have no effect. Wiki build instructions now show
how to use these.
http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux
 2011-11-11 14:52:24 +00:00
Brecht Van Lommel
5b1a42cb17 Cycles: 
* Fix excessive fireflies in Velvet BSDF (patch by David).
* Disable some unused SSE code
* Remove RTTI disabling flags for now, this is giving some compile issues and
  was only needed of OSL which we're not using yet.
 2011-11-10 14:32:16 +00:00
Nathan Letwory
f0adbb7746 Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init. 
Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).
 2011-11-09 17:22:55 +00:00
Brecht Van Lommel
adf17b48d8 Cycles: mac + scons build should not work. 2011-11-09 11:49:39 +00:00
Antony Riakiotakis
2f1e51ac99 correct comment, no longer needed. 2011-11-09 11:38:04 +00:00
Antony Riakiotakis
83b16687b9 Make scons work MinGW. This commit resolves several issues such as enable OpenEXR, Game Engine and Player, enable latest features, and solve link order for gcc. So MinGW is right now fully supported as a build system for release type builds. Debug builds not tested. 2011-11-09 11:33:10 +00:00
Thomas Dinges
7f273394d5 Cycles: 
* Scons: Disable Cycles per default on Linux/Mac for now until compile issues have been sorted out.
 2011-11-08 21:46:31 +00:00
Thomas Dinges
af867438fc Scons: 
* Fixing x64 compile with Cycles.
 2011-11-08 21:17:42 +00:00
Thomas Dinges
a645935a1d Build system fixes: 
* Fixed Boost libs names after upgrade to 1.47
* Remove old reference to space_sound from cmake.
 2011-11-08 20:56:55 +00:00
Nathan Letwory
c9bca51e76 Add compiles support for Cycles. 
No CUDA compiling yet, will be added later.
 2011-11-08 20:40:02 +00:00
Thomas Dinges
563becafb9 Scons: 
* Basic support for OpenImageIO and Boost libraries
* Path to libraries added for win32/64-vc-config.py, still commented out.
 2011-11-03 12:40:15 +00:00
Campbell Barton
9c801a6d85 Correction to own commit r41169 2011-10-31 09:52:43 +00:00
Campbell Barton
5efcf9bd1f remove scons files for unsupported/obscure unix variants, these configs are not maintained (aix defined FREE_WINDOWS for example and nobody noticed), and CMake builds on OpenBSD/NetBSD with no manual configuration. 2011-10-21 04:26:48 +00:00
Campbell Barton
d37760bc34 cleanup scons build flags, many duplicates because because of confusion between CFLAGS/CPPFLAGS/CCFLAGS/CXXFLAGS, devs would set multiple to be on the safe side. 
- defines go in CPPFLAGS
- C & C++ flags go in CCFLAGS
- CFLAGS / CXXFLAGS are C OR C++ only.

also commented intended ghost unicode/ascii usage.
 2011-10-21 04:23:26 +00:00
Campbell Barton
78a8f8a4b1 - remove release/bin/.blender/.bfont.ttf, we have ./release/datafiles/bfont.ttf already, and its not used anymore. 
- removed scons WITH_BF_FREETYPE
 2011-10-21 03:16:01 +00:00
Nathan Letwory
1023ed4e4d Make sure that default settings have OpenMP support by default (also good for buildbots). 
Note that builders that don't have VS pro version need to manually disable this setting in their respective user-config.py
 2011-10-02 17:53:52 +00:00
Joerg Mueller
07ad83a439 * Removing libsamplerate from build systems 
* Enabling OpenAL for scons win64-vc in default config; Nathan or Sergey: please update the build bot to build with OpenAL!
 2011-10-02 17:09:39 +00:00
Jens Verwiebe
6f9636b800 OSX: another non-ASCII char, sorry 2011-09-29 17:02:19 +00:00
Jens Verwiebe
6088d460ef OSX: Give clear commenting and more up-to-date defaults 2011-09-28 17:28:37 +00:00
Jens Verwiebe
eb2c89ab87 OSX: change omp default True gor gcc-4.6.1 only atm 2011-09-28 17:21:08 +00:00
Campbell Barton
4b449aefea remove support for irix 2011-09-21 08:40:30 +00:00