Commit Graph

23 Commits

Author SHA1 Message Date
Sergey Sharybin
732c566f2f Fix #35587: Cycles: image movie to single image crashing
Crash was happening on windows platforms only and was caused
by some specifics about how CRT works.

Basically, blender and all of the .dll are compiled with /MT
flag, which means blender.exe and all .dll are using separate
environments. This makes it impossible to pass file descriptors
from blender to other dll, because it becomes invalid in the dll.

And this is exactly what was happening: OIIO was trying to open
movie file with all known plugins and one of them was zlib. And
the way OIIO was using zlib API is opening the file using Boost
and passing a file descriptor to zlib. And since zlib was a
dynamic library this lead to general issues using this descriptor
in zlib code.

Solved by linking to zlib statically. This allows to safely pass
file descriptor to zlib API. Alternative would be to compile all
the stuff with /MD flag, but that's much bigger and less robust
way to fix the issue.

Tested on windows using msvc2008, scons plus cmake both 32 and 64
bit versions. Seems to be working fine.

Further tweaks for mingw and msvc2012 could be needed tho.
2013-06-02 15:02:17 +00:00
Tamito Kajiyama
eeb95280be Missing build_files updates in the merger in revision 55847. 2013-04-07 06:44:33 +00:00
Campbell Barton
0a5d44588c switch verious references from py3.2 -> 3.3 or just 3. 2012-11-26 13:58:06 +00:00
Bastien Montagne
0738284e32 Clen up of gettext stuff from scons scripts... Did not touch to buildbots ones, nor to iconv, as it’s still uncleare whether we can get rid of it :/ 2012-11-11 19:46:36 +00:00
Thomas Dinges
3d4a14149b Scons:
* Some code and comment cleanup
* Remove cmake equivalent variable comments
* Remove some non used parameters from config files and btools: WITH_BF_FMOD, BF_VERSION.
* Remove some commented non-used variables
2012-04-07 18:26:54 +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
Sergey Sharybin
a0e62e77d7 Update build files to use new OpenAL libraries 2011-12-27 09:37:19 +00:00
Jens Verwiebe
ea38cb2e5e Scons_buildsystem: add WITH_BF_OCEANSIM = True to all configs 2011-11-13 15:10:54 +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
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
Sergey Sharybin
899bd19c71 Forgot to add FFmpeg DLLs list to linuxcross config. 2011-09-08 19:05:52 +00:00
Sergey Sharybin
0e3b8ff6a5 Update rules for linux cross and mingw: list of DLLs for FFmpeg should be defined there. 2011-08-22 19:27:54 +00:00
Sergey Sharybin
a33a26ca07 FFmpeg library update:
- Update scons/cmake rules to use new versions of libs/dlls.
- Update rules for buildbot.
2011-08-22 18:49:42 +00:00
Campbell Barton
c786a2c805 edit scons to use py3.2 on all os's and use 'm' abiflag on linux since this is the most common. 2011-03-12 01:03:15 +00:00
Campbell Barton
a001b3f072 set 2mb stack for mingw too. 2011-03-12 00:50:34 +00:00
Campbell Barton
bc15e0e295 add NDEBUG to scons release flags + some pep8 cleanup for examples. 2011-02-25 16:19:50 +00:00
Campbell Barton
f2ab4dd6a7 use flag _DEBUG, not DEBUG. 2011-02-25 15:46:43 +00:00
Campbell Barton
cd97253502 - added GCC warning -Wstrict-prototypes
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
2010-12-03 12:30:59 +00:00
Sergey Sharybin
228ed6f086 Global definition of _LARGEFILE_SOURCE, _FILE_OFFSET_BITS and _LARGEFILE64_SOURCE at linux and win32/mingw platforms
Needed to work properly with large files at 32bit system (display correct size in file browser, i.e.)

This will also fix compilation with zlib 1.2.5
2010-11-04 17:02:25 +00:00
Campbell Barton
58683fa993 enable DEBUG define in CMake and scons, also change booleans debug option to BOP_DEBUG, which was used inconsistently, and had to add a define for superlu. 2010-10-18 11:21:22 +00:00
Sergey Sharybin
1f8f55b3cd - Reverted "Set FREE_WINDOWS when compiling with MinGW"
- Reverted own changes made to _stat function BLI_exists
- Use __MINGW32__ instead of FREE_WINDOWS in BLI_exists
- Removed recently added lib dependencies for mingw
2010-07-19 09:19:54 +00:00
Sergey Sharybin
266438b5e0 - Use correct paths for mstoolkit and crossmingw tools in sconscript
- Use _stat64i32 instead of _stat in BLI_exist
  Needed for correct compilation by mingw, no sense for msvc
  (_stat is equivalent to _stat64i32 in Visual C++ 2005, and later i suppose)
- Added library msvcr90 for mingw to solve linking error to _stat64i32
2010-07-19 09:02:27 +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