Commit Graph

32 Commits

Author SHA1 Message Date
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
Brecht Van Lommel
75913ce446 2.5 Beta version files increment, from 2.52 to 2.53. 2010-07-20 16:44:59 +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
Guillermo S. Romero
2f96ac8b9f SVN maintenance. 2010-07-15 20:30:31 +00:00
Campbell Barton
7fc9eee08a - updated man page from --help output.
- cmake now installs the man page.
- added cmake_linux_install.sh, shell script which downloads and builds blender.
2010-07-15 19:58:23 +00:00
Campbell Barton
1bb789956d CMake patch from Ralf Hölzemer (cheleb)
[#22849] Fix cmake install target on linux
--- from the tracker ---
This patch fixes the install target for the linux platform. Since the new configuration path changes are in effect, files have to be installed in the correct places instead of just copying the local installation to $PREFIX/share/blender.

It also provides a new macro to determine the correct blender version values.

Changes in this patch include:

- the .desktop menu file is installed in $PREFIX/share/applications and points to the svg icon instead of a png one, which is also installed in $PREFIX/share/pixmaps
- docs are installed in $PREFIX/share/doc/blender
- scripts are installed in in $PREFIX/share/blender/x.xx/
- locales are installed in in $PREFIX/share/blender/x.xx/datafiles
- a new cmake macro determines and sets the correct values for BLENDER_VERSION_MAJOR, BLENDER_VERSION_MINOR, BLENDER_SUBVERSION, BLENDER_VERSION, BLENDER_MINVERSION_MAJOR, BLENDER_MINVERSION_MINOR, BLENDER_MINSUBVERSION and BLENDER_MINVERSION by parsing source/blender/blenkernel/BKE_blender.h and calculating major/minor values. This replaces the hardcoded value in the top CMakeLists file and is used by all platforms.
2010-07-14 20:26:46 +00:00
Damien Plisson
a6a646cf5b Scons/darwin (OSX): blender.app package is now created correctly in the install folder 2010-07-14 18:19:34 +00:00
Campbell Barton
bfe11037b5 move nan mk files from source/ into build_files/make/ 2010-07-13 00:57:19 +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