Commit Graph

230 Commits

Author SHA1 Message Date
Campbell Barton
bb6e0834e0 cmake: combine debug/optimized into one target_link_libraries() call. 2011-06-15 13:42:02 +00:00
Campbell Barton
4f3936083a replace own inline cmake include search logic for a typical FindXXX.cmake module. 2011-06-15 12:09:02 +00:00
Campbell Barton
1243992f27 cmake: correct uninitialized vars 2011-06-14 00:24:50 +00:00
Nathan Letwory
1b1fdd7ecf Turn off Quicktime support by default. Will be phased out soon. 2011-06-13 09:33:27 +00:00
Campbell Barton
fedc811014 minor updates to the cmake checker 2011-06-13 03:09:14 +00:00
Campbell Barton
c2e1f3a1e2 fix for using system includes, the include macro wasn't un-setting the previous include list so system includes could be mixed up with non system includes.
Also workaround for CMake 2.8.4 & GNU-Make which doesn't set CMAKE_INCLUDE_SYSTEM_FLAG_C
2011-06-11 06:00:28 +00:00
Campbell Barton
9cf0bbb95c added a check to console auto-compleation for pythons struct_seq type, so bpy.app and sys.float_info autocompleate their attributes rather then bring treated as a typle. 2011-06-10 09:44:27 +00:00
Nathan Letwory
899f2776db Shuffle some build code around to ensure debug builds on Windows actually run too.
* creator/SConscript is now empty, code is moved to an emitter function in Blender.py
* make sure COLLADA debug libs are used when BF_DEBUG=True
2011-06-08 11:53:07 +00:00
Campbell Barton
7b9eabb6f2 fix from nico_ga on IRC, building on MSVC with jack but not ffmpeg. 2011-06-06 08:40:47 +00:00
Sergey Sharybin
d84c6a3cdb Fix for linux buildslaves. Now they should be able to compile branches. 2011-06-03 21:36:39 +00:00
Brecht Van Lommel
06ca703737 BuildBot: various changes to support building branches. 2011-06-03 20:44:23 +00:00
Brecht Van Lommel
7b4aac3e34 Fix #27481: windows uninstaller could remove files unrelated to blender
when installing to a folder that already existed. Now the uninstaller
will remove only the files it has installed, and leave any other files
in the installation directory intact.
2011-06-01 13:13:55 +00:00
Campbell Barton
09da9d4393 cmake maintenance
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
Campbell Barton
20ae95422e include ffmpeg_compat header in cmake source list. 2011-05-28 04:53:17 +00:00
Brecht Van Lommel
d369a6aaaf Windows installer and Path changes, fixing various issues:
* Windows installer not working for non-admin users and multiple users
* Addon scripts not installing next to user configuration
* Portable install not being taken into account in all places

The main problem was the windows installer was installing system scripts in
AppData next to the user configuration directory, which is not shared between
users. Now these are installed in ProgramFiles, and only addon scripts added
by the users go to AppData.

On all platforms, addon scripts were sometimes getting installed between
system scripts, because the scripts folder in the executable directory was
given precedence over the user configuration folder, that is no longer done
now. So addons now behave like user configuration, they are preserved even
if you download a newer build of the same blender version.

If you have an installation of 2.57 on windows, the addon install location
will not change until we do the version bump to 2.58, to avoid conflicts with
the existing the installed 2.57 version.

The old behavior of giving precedence to the local folder was done to support
portable install, where all configuration is written to the local folder. This
is now implemented differently: if and only if a "config" folder exists in the
local folder, portable install will be assumed, and files will only be written
to that local folder.
2011-05-27 09:57:53 +00:00
Campbell Barton
514de547ac update to build system excluding parts of the python bundle. 2011-05-26 11:45:25 +00:00
Campbell Barton
26252bb315 correct spelling error and some pep8 changes. 2011-05-26 09:33:51 +00:00
Campbell Barton
b69c1e8f1a CMake changes
- don't allow building if the LIBDIR is not found on mac/windows.
- by default use -O2 rather then -O3 for GCC release flags, was crashing some GCC versions and blender releases are supposed to use -O2.
2011-05-23 14:56:14 +00:00
Sergey Sharybin
a8ef6ffd17 typo in previous commit 2011-05-20 13:10:40 +00:00
Sergey Sharybin
e721d31b5d buildbot:
ffmpeg was compuled with faad now (aac support which keeps
libs gpl2 compatibile).
Updating library dependencies for buildbot rules.
2011-05-20 13:06:19 +00:00
Campbell Barton
0858904571 fix [#27414] no-material renders differently in View3D vs BGE
when a texface layer exists this still overrides the default material.
2011-05-17 02:44:52 +00:00
Brecht Van Lommel
b434e7f933 LCMS code removed, was an experiment but never finished. 2011-05-16 13:34:42 +00:00
Campbell Barton
5cfc13a11d fixed incorrect jemalloc library & updated netbeans project to ignore __pycache__. 2011-05-16 10:34:40 +00:00
Guillermo S. Romero
9b236a7a12 SVN maintenance. 2011-05-16 06:11:14 +00:00
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