Commit Graph

206 Commits

Author SHA1 Message Date
Campbell Barton
0460a68ae7 made generic module for generating project files from cmake,
added netbeans project file generator.
2011-05-16 04:04:06 +00:00
Sergey Sharybin
6786f92fe5 Use jemalloc in buildbot for linux targets 2011-05-13 12:57:54 +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
Campbell Barton
424a0cca27 option to link with jemalloc on *nix, off by default. 2011-05-12 11:16:32 +00:00
Campbell Barton
2e3538cf24 patch from Dan Eicher for cpack rpms 2011-05-10 21:59:11 +00:00
Campbell Barton
770119d16f patch from Dan Eicher, CPack/RPM working again 2011-05-06 23:59:15 +00:00
Brecht Van Lommel
309bb2937d Forgot to mention that for scons, I've disabled install of the texture and
sequence plugins, as was already done for cmake, they don't work in 2.5.

This is a fix for last commit, this file shouldn't have been included.
2011-05-06 20:21:20 +00:00
Brecht Van Lommel
cb12337363 Code cleanup: remove source/kernel module, this wasn't really the kernel of
anything, only contained a hash map and functions to pass command line args
to the game engine. Moved those to container and BlenderRoutines modules.
2011-05-06 20:18:42 +00:00
Campbell Barton
2938695b17 remove dos/unix conversion scripts, enough editors and utilities can do this.
update debian spec for new icon location.
2011-05-02 15:56:52 +00:00
Joseph Eagar
088899236b =trunk=
Recommitted eltopo collision code (but disabled by default)
with Genscher's permission.

To use, you need to install liblapack and libblas
2011-05-01 21:39:13 +00:00
Sergey Sharybin
16bd053555 buildbot: switch to ffmpeg 0.6.3 2011-04-27 12:50:47 +00:00
Sergey Sharybin
05c7db95b6 buildbot:
Fixed typo for 64bit blenderplayer which caused undefined symbol gzopen64
2011-04-21 19:01:31 +00:00
Sergey Sharybin
11caf24c55 buildbot:
Use BF_NUMJOBS from user cinfigs rather than passing it as
command line argument.
2011-04-17 06:17:37 +00:00
Sergey Sharybin
bf591017b3 buildbot:
- use cores+1 threads
- do not clean build directories
- separate build directories for blender and blenderplayer

This should make compilation much faster and buildbot rebuild tag could
happen more often
2011-04-16 21:23:05 +00:00
Campbell Barton
f0b45cc1fb - fix for cmake when there is no version character.
- link to release docs correctly from the splash page.
2011-04-12 16:20:41 +00:00
Campbell Barton
a42bf45333 revert Joseph Eagar's eltopo commits r36073, 36075 (& some minor edits)
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners.

Its also too close to release to be making these kinds of changes.

commands used:

  # reverse merge
  svn merge -r36073:36072 .
  # for some reason this gave a lot of property changes
  svn revert `svn st | grep "^ M" | awk '{print $2}'`
  # reverse merging didn't work here, removing while dir.
  svn rm extern/eltopo/


  # manually fixed conflict in
  # ./source/blenderplayer/CMakeLists.txt
  #
  # also manually removed 2 lines from
  # ./CMakeLists.txt
2011-04-12 11:09:10 +00:00
Campbell Barton
28594bc742 minor pep8 edits, also added 'test_pep8' & 'test_cmake' to the GNUmakefile for convenience. 2011-04-10 10:45:56 +00:00
Joseph Eagar
0a60bc14d6 =cloth collisions=
Plugged the eltopo library into the cloth solver.
I was playing with it earlier, and it's so easy to
use I decided to quickly put it in (trunk's) cloth.

See http://www.cs.ubc.ca/labs/imager/tr/2009/eltopo/eltopo.html
.  The authors are on the bleeding edge of continuous collision
detection (one of them did ILM's cloth sim).  
I
don't really have to time to plug it into softbody, particles,
bullet, fluid, etc, but doing so would be pretty straightforward.
I'll leave that up to someone else.

To use, turn on USE_ELTOPO (in cmake) or WITH_BF_ELTOPO in scons.
2011-04-09 23:19:11 +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
Nathan Letwory
a0b172215d Clean up linking flags for win32. 2011-04-08 14:56:31 +00:00
Nathan Letwory
4d2562fb47 Clean up linking flags for win64. 2011-04-08 14:40:43 +00:00
Campbell Barton
5c7bed92d4 fix for cmake glew includes (tested with mingw), also made qtcreator project generator work with mingw again 2011-04-06 03:02:40 +00:00
Guillermo S. Romero
d00501dfd0 SVN maintenance. 2011-04-06 00:22:44 +00:00
Campbell Barton
ca254dd37b add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their own glew library. 2011-04-05 23:31:01 +00:00
Campbell Barton
162d02bf50 quiet warning & minor pep8 edits. 2011-04-04 22:42:43 +00:00
Sergey Sharybin
6f20760818 buildbot: static zlib linking
Force link to zlib for all platforms/tragets to be sure there'll
be no gzopen64 symbol undefined (it was in some dependend library, so
blenderplayer wasn't working in fedora 13 32bit)
2011-04-04 19:39:47 +00:00
Campbell Barton
744a3b9cb2 fix cmake for when BLENDER_VERSION_CHAR is not set. 2011-04-03 07:48:33 +00:00
Campbell Barton
21bd7fd8d5 patch [#26606] Debian spec: Bump to Python 3.2
also update pacman spec.
2011-04-02 21:51:05 +00:00
Sergey Sharybin
90326c4c6e buildbot:
- Remove packed to buildbot_archive.zip archive file to keep scons install
  directory as clean as possible (if i understood correct, this file isn't
  actually needed in the future, so we could remove it just after packing rather
  than cleaning install directory before packing as it's done for cmake)
- No need in scripts installation for linux slaves when preparing archive
2011-04-02 21:11:22 +00:00
Sergey Sharybin
7690086d20 pep8 fixes for buildbot 2011-04-02 05:53:42 +00:00
Sergey Sharybin
6d4f57bc3a Oops, i've forgot that archive is preparing by scons, so stripping should
happpen before calling scons (hope, binaries wouldn't be overwritten by it)
2011-04-01 21:38:04 +00:00
Sergey Sharybin
485229b7db Initial support of linux 32/64 bit for buildbot:
- Use the same config as we're using for release builds
- Added stipping (maybe it should be generalized)
- Not software gl packing, bot would be easy to add

Note, that you should have special environment to create
proper linux builts (which would work for everybody)
2011-04-01 21:22:19 +00:00
Campbell Barton
c8652b301f pep8 checker, mostly pedantic style changes but also found an error in mesh_utils.mesh_linked_faces() 2011-04-01 02:41:15 +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
Nathan Letwory
e4ef822ecd build target was changing into wrong directory. 2011-03-29 12:10:41 +00:00
Campbell Barton
aa2269e065 remove DEBUG flag from OpenNL with cmake, was giving too many prints in the console when unwrapping. 2011-03-29 11:50:37 +00:00
Campbell Barton
50a06eccff pep8 cleanup 2011-03-27 05:23:14 +00:00
Campbell Barton
f08a227f93 include gcc builtin defines in qtcreator project file (__VERSION__, __x86_64__, __linux__ etc) 2011-03-25 12:42:33 +00:00
Campbell Barton
19819dcbc7 write project files into the build dir. 2011-03-24 10:54:42 +00:00
M.G. Kishalmi
0c9488b2f3 the script is now creating 2 project files:
Blender.creator
Blender_Python.creator

.glsl files have been added to the former
latter contains everything .py
2011-03-24 08:33:42 +00:00
Campbell Barton
c210b3991a support for blender as a module on win32. 2011-03-24 00:14:49 +00:00
Campbell Barton
95173a4ae8 minor changes to master unpack script. 2011-03-23 01:08:10 +00:00
Brecht Van Lommel
e5eed21a6b Buildbot master tweaks: use generic builder for scons win32, unpack fixes. 2011-03-22 15:25:18 +00:00
Brecht Van Lommel
04a63cb393 Buildbot updates: working windows scons build, and run slave_*.py scripts
to compile/test/package directly from svn, easier to make changes this way.
2011-03-22 13:05:05 +00:00
Nathan Letwory
e8dc841199 Version and platform name were in wrong order. 2011-03-22 12:54:13 +00:00
Nathan Letwory
d2a721cfd5 Add buildslave target for builder.blender.org integration 2011-03-22 10:26:53 +00:00
Nathan Letwory
a1567aa7c0 Printing error message would fail on exception. 2011-03-22 08:58:49 +00:00
Campbell Barton
d781ecff75 fix for grease pencil conversion to bezier curve reading past the end of the array. 2011-03-21 23:30:56 +00:00
Campbell Barton
4bca2e455d use spaces rather then tabs + minor pep8 edits. 2011-03-21 22:37:08 +00:00
Brecht Van Lommel
9a75ba4463 Buildbot initial configuration files, for http://builder.blender.org
Maintained in svn to make it easier for others to contribute changes,
actually updating builder.blender.org requires manual update on the
server.
2011-03-21 16:46:26 +00:00