Commit Graph

59 Commits

Author SHA1 Message Date
Campbell Barton
741d5a6c06 fix for CMake file grouping with MSVC project files. 2010-11-08 06:31:45 +00:00
Campbell Barton
36b8ebceb5 added back include file globbing for cmake, thought this was needed for MSVC only but turns out QtCreator also needs this else it wont index headers. 2010-11-05 04:18:53 +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
Guillermo S. Romero
2cef9203ba Add PREFIX support to makefiles. 2010-11-01 23:17:58 +00:00
Campbell Barton
0876fce009 rename and negate DISABLE_PYTHON --> WITH_PYTHON 2010-10-31 04:11:39 +00:00
Campbell Barton
50dab4fc37 rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE 2010-10-31 03:20:33 +00:00
Nathan Letwory
f875777212 Change /WX away for now, some odd thing going on between cloned environments. Need to check after release. 2010-10-26 23:32:59 +00:00
Campbell Barton
c7ff23cc34 Added CMake macro REMOVE_STRICT_FLAGS(), this means developers can build with -Werror in their CMAKE_C_FLAGS_DEBUG (so all warnings give errors).
but external libs which we don't maintain & generated code will have -Werror removed.

This is GCC only, MSVC can be added easily.
2010-10-24 03:57:07 +00:00
Campbell Barton
f4415ce84a - CMake now only uses SOURCE_GROUP with MSVC lib configuration, saves recursive header search when not using msvc.
- uv layout export wasn't setting the default filename.
2010-10-23 04:18:53 +00:00
Nathan Letwory
db74070778 Make C4013 throw a warning
-> 'function' undefined; assuming extern returning int
2010-10-19 05:42:31 +00:00
Nathan Letwory
62aacd1aa7 Set defaults for compile and link flags to lists. 2010-10-19 05:21:28 +00:00
Nathan Letwory
2a89fb887e * Enable compile and link flags to build info also on Windows and in SCons.
* Added build_system SCons or CMake
* Write the new build info also to system-info.txt
2010-10-19 05:00:36 +00:00
Campbell Barton
3498e22468 Disable LCMS by default for scons. 2010-10-19 02:50:00 +00:00
Nathan Letwory
6e77dc1942 whitespace commit, AKA commit count bump. 2010-10-18 20:33:04 +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
Campbell Barton
952b728578 Test stricter GCC compiler settings, these warnings will now give errors.
- implicit function declaration.
- no return type set for a function.
- declaration after statement.

This may be too strict but in general I prefer we don't allow commits with these warnings.
Applies to cmake/gcc and scons/linux.
2010-10-17 08:04:28 +00:00
Campbell Barton
f0fcf140f8 enable warning for unused args with gcc: -Wunused-parameter
- for cmake only apply this to source/blender, will apply globally later.
- ./extern/ ./source/blender/makesrna/intern/ ignore this.
2010-10-15 02:24:48 +00:00
Nathan Letwory
663ce490e0 Enable CXX_GUARDEDALLOC support through SCons. 2010-10-08 20:39:56 +00:00
Sergey Sharybin
5bab95fc58 Scons options for static linking to libsamplerate, sndfile and fftw3 2010-10-05 16:43:01 +00:00
Nathan Letwory
31ff2a6da2 Enable lcms support on Windows. 2010-10-05 13:39:45 +00:00
Campbell Barton
c5086987ec fix for scons with recent buildinfo change 2010-10-03 11:33:44 +00:00
Nathan Letwory
4418396a45 Change <UNKNOWN> to -UNKNOWN- so exporters can be happy too, when a build was created without svnversion (or from export). 2010-10-01 08:29:27 +00:00
Ken Hughes
d0451fea58 Changes to scons for building with static zlib and tiff libraries. 2010-09-21 21:10:49 +00:00
Campbell Barton
6963574a55 scons now gets the blender version from BKE_blender.h. 2010-09-18 10:37:51 +00:00
Campbell Barton
4bba0e3397 spec files for building arch linux packages (pacman) 2010-09-12 16:00:12 +00:00
Ton Roosendaal
40bf22e955 Part 4 of 2.54 beta commits (last) 2010-09-10 16:39:08 +00:00
Campbell Barton
115b256738 ran through pep8 checker 2010-09-07 15:17:42 +00:00
Joshua Leung
88f657f251 scons compiling fix:
When "svnversion" can't be found (as is usual for anyone running TortoiseSVN), build_revision info will be "", which breaks compiling. Worked around this for now by using "<UNKNOWN>" as this
2010-08-30 00:49:23 +00:00
Nathan Letwory
cb786f0022 Remove unnecessary \''s. This cleans up also printouts in splash and bpy.app (no more unnecessary quotes). 2010-08-29 21:53:12 +00:00
Nathan Letwory
c29b5df739 Changing representation, so there's no space between the words. 2010-08-29 21:49:50 +00:00
Nathan Letwory
6c113b54b3 Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00
Nathan Letwory
999bb69c70 Properly set build type: Release or Debug 2010-08-29 19:47:26 +00:00
Nathan Letwory
57aee2ecf4 Tell what platform and its bitness in BUILD_PLATFORM 2010-08-29 19:44:50 +00:00
Nathan Letwory
cc70bffb62 Make sure correct python31 zip is unpacked when BF_DEBUG=True 2010-08-27 21:42:33 +00:00
Nathan Letwory
f647ba1ce5 Patch [#5429] SCons patch for linux: support more libs to be linked statically
Contributed by Rui Campos, adapted for current trunk

This was a very ancient patch on my todo list (mid-December 2006). Some things already were done, so I
added now ffmpeg and freetype support for linking statically. FFMPEG part is untested further from my part
so if you run into problems with that, please report.
2010-08-26 08:04:58 +00:00
Nathan Letwory
92422ba452 Patch [#23389] Add authorship information to exported COLLADA files
Contributed by Imran Syed (freakabcd).

This adds basic authoring tool and author info ("Blender User" for now).

NOTE: Linux and OSX users need now to update their OpenCOLLADA libs - Blender should now compile fine with their latest revision.

Made some changes to the original patch to ensure linking is done correctly.
Some small cleanups for scons too.
2010-08-26 06:58:32 +00:00
Campbell Barton
141da38088 patch [#23359] Addenda: fixes for SCons FreeBSD 7, 8, 9 support
from Jashank Jeremy (jashank)
2010-08-25 14:33:50 +00:00
Nathan Letwory
446122d112 == SCons ==
Make it possible to link statically against libgettext. Set WITH_BF_GETTEXT_STATIC to True and put static lib in BF_GETTEXT_LIB_STATIC (absolute path works probably best). BF_GETTEXT_LIB will be ignored.
2010-08-24 13:08:14 +00:00
Campbell Barton
70e99a3476 make quicky wrapper for cmake.
works like scons where using a subset of the targets name is enough.

  make_quicky.py py
...expands into
  make  bf_python bf_python_ext blender/fast

arguments like -j4 are passed on.
2010-08-24 05:24:37 +00:00
Nathan Letwory
801ba2e345 Apply patch #23295 - Fix for SCons building on FreeBSD
Patch submitted by Jashank Jeremy. This adds support for freebsd7, freebsd8 and freebsd9. Thanks!
2010-08-13 20:54:34 +00:00
Joilnen Leite
2a72eb8c28 Fixing make files compilation in linux 2010-08-11 14:51:52 +00:00
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
Ton Roosendaal
5d18274cac Makefile fix: on PowerPC architecture SSE compile should not happen.
Note for the coder here, is it correct to enable SSE with a general
WITH_BF_RAYOPTIMIZATION flag? Just call it WITH_SSE? More clear :)
2010-08-05 14:04:56 +00:00
Stefan Gartner
2f8f86e4f6 fix path to release/python.zip for scons and cmake
I hope this doesn't break anything
2010-08-04 11:07:14 +00:00
Stefan Gartner
d50cc7826f == Makefiles ==
* add support for LCMS (disabled by default, set WITH_LCMS to true to enable it)
 * fixed typo that prevented TIFF support to be properly enabled
 * enable ray optimization by default (scons and cmake already did this)
 * fixed building with libsndfile on darwin (disabled by default)
 * quicktime: use audaspace headers from $(NAN_AUDASPACE)/include instead of intern
 * gameengine: add -DWITH_FFMPEG to compiler flags when building with ffmpeg support
2010-08-04 08:42:18 +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
ec2c52c9c8 SCons
- remove scons option WITH_BF_FHS, its not needed anymore.
- comment WITH_BF_DOCS, was using epydocs which we dont use now.
- blenderlite target was broken, always using openmp.
- building without python wasnt working.

- fixed some warnings.
2010-08-02 16:27:41 +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
Nathan Letwory
3e387b8c42 * for win64 fftw3 support is already enabled by default, doing so also for win32. 2010-07-28 17:08:24 +00:00
Campbell Barton
bed40ed8e3 move directories:
dlltool --> build_files/make/dlltool
 bin --> release/bin
 
Since dlltool is only used make + mingw and ./bin is misleading because it would seem the blender binary would be copied there, but its just used for home directory files.

updated scons/cmake/make
2010-07-26 11:47:33 +00:00