sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
41,124 Commits 2 Branches 0 Tags 753 MiB
3968b63735
Commit Graph

36 Commits

Author SHA1 Message Date
Antony Riakiotakis
3968b63735 * Enable opencolorio for scons/mingw32 (coming very soon) 
* Change names of libraries for mingw32 boost to 1.49
 2012-09-16 20:26:28 +00:00
Sergey Sharybin
b93da9b01e Color Management, Stage 1: Initial OpenColorIO library integration 
This commit integrates support of OpenColorIO library into build systems.

It also contains C-API for OpenColorIO library which could be used by Blender.

CMake has got find rules familiar to OpenImageIO's one which makes it easier
for build system to find needed libraries and includes. Scons only could use
explicitly defined paths to libraries and includes.

C-API would be compiled and Blender would be linked against C-API and OpenColorIO
but it wouldn't affect on Blender behavior at all.

OpenColorIO could be disabled by setting up WITH_OCIO to Off in CMake and
setting WITH_BF_OCIO in Scons.
 2012-09-15 10:03:17 +00:00
Antony Riakiotakis
bcb552ef94 Enable shader model 3.0 shaders for mingw compilers 2012-09-01 14:53:01 +00:00
Antony Riakiotakis
84c0aee254 Correct openjpeg for scons too. 2012-06-21 14:49:10 +00:00
Antony Riakiotakis
1937f3b8de Disable building of CUDA 1.3 kernels for cycles for win32 cmake and mingw32 scons. They were already disabled for scons MSVC 32bit. 2012-05-22 12:30:37 +00:00
Antony Riakiotakis
c498c0eb42 Update build files to use the new lib locations for MinGW. For builders: you will need to checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/mingw32/ 
to build with MinGW past this commit.
 2012-04-23 01:11:42 +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
Antony Riakiotakis
d184fe0df3 Missed Scons update for MinGW boost 2012-02-26 16:54:20 +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
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
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
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
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
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
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
Antony Riakiotakis
aabd702dbd fix link issues with MinGW - a substitute declaration(correctByteOrder) for itoln that was not present in MinGW was being used. Duplicated the declaration from <winsock2.h>(tried including but gave some errors) and added the appropriate link library, wsock32, according to MinGW documentation. 2011-09-06 11:17:29 +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
161927e27e remove -mwindows flag for scons/mingw, enable manifest & winblender.rc for all windows builds except for msvc2010 2011-04-09 00:10:29 +00:00
Campbell Barton
a001b3f072 set 2mb stack for mingw too. 2011-03-12 00:50:34 +00:00
Campbell Barton
1eb57bcbc7 disable openexr and collada for mingw, give linking errors. 2011-03-08 23:12:45 +00:00
Ervin Weber
98d444109e change mingw-scons to use python 3.2 2011-03-04 10:19:02 +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