Commit Graph

27 Commits

Author SHA1 Message Date
Brecht Van Lommel
b434e7f933 LCMS code removed, was an experiment but never finished. 2011-05-16 13:34:42 +00:00
Sergey Sharybin
8941cc626a Option to use jemalloc when building with scons under linux.
Disabled by default.
2011-05-13 12:08:34 +00:00
Nathan Letwory
5b19ec3559 Apply patch [#26660] Scons build on OSX fails to create Info.plist file fix
provided by Mike Sloman

from the patch report:

When building on Mac OSX with SCONS the Info.plist file is zero length and thus OSX cannot identify icons and file type associations.

The problems was in the execution of the "date" command to add times in the modified bundle name strings passed to sed. This failed and thus the info.plist file was overwritten with 0 length file.
2011-03-30 05:44:01 +00:00
Brecht Van Lommel
bcee2343ea Mac OS X cmake changes and bundle fixes
For cmake users, you should now use "make install" instead of "make". This was
already changed for Linux and Windows. Same for Xcode, use the install target.

Changes:
* CMake install mechanism, resulting bundle was verified to be indentical here.
* For cmake, include Info.plist in bundle using builtin mechanism for that.
  There was some code in packaging.cmake, but it wasn't correct as these
  properties need to be set on the executable.
* For scons, fix app bundle version, was still using removed release/VERSION.
* Remove unused blendercreator.app and blenderpublisher.app.
* Fix Info.plist being set as a binary file in svn, should be plain text.
2011-03-16 15:44:17 +00:00
Campbell Barton
a9f08f6310 use tar.gz for windows python zipfiles rather then .zip,
since cmake can only extract tar's
2011-03-06 11:18:57 +00:00
Nathan Letwory
9234cb6e30 Make sure python.zip is extracted only once. This prevents erroring build on the unzip stage. 2011-02-28 13:18:00 +00:00
Campbell Barton
5ef65a0a3b build system now exclude config-*, turtledemo when copying system python.
also remove __pycache__ dirs when cleaning (new in python 3.2)
2011-02-28 05:59:44 +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
Sergey Sharybin
5bab95fc58 Scons options for static linking to libsamplerate, sndfile and fftw3 2010-10-05 16:43:01 +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
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
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
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
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
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
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
d80d6e2812 re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config 2010-07-12 18:26:35 +00:00