Commit Graph

123 Commits

Author SHA1 Message Date
Campbell Barton
d5ee95644d win32 mingw works again with cmake 2010-09-15 14:36:32 +00:00
Campbell Barton
74059891e9 option to disable ITASC IK solver, (will be enabled by default ofcourse)
- option only available to cmake, scons and make have this enabled always.
- without this clang/llvm can compile blender
- this was the second biggest internal lib, 192mb -> 172mb for all blenders libs (with debug flags), so gives some speedup to linking.
2010-09-12 12:27:12 +00:00
Campbell Barton
ecbb170bb0 patch [#23717] Another install target fix for cmake/linux
from Ralf Hölzemer (cheleb)

 fix for *nix install target
2010-09-08 03:13:19 +00:00
Campbell Barton
2406ebe1a4 - added back zlib include (needed for win32).
- use list append in more places.
- remove non existing include dir.
2010-09-07 01:13:10 +00:00
Campbell Barton
04b0dcd9e5 - use list append in more places (preferred method since its faster)
- remove some unused include paths
- remove unused linux path define
2010-09-06 10:15:41 +00:00
Nathan Letwory
e03437a34a Fix [#23638] Missing directory creation
Reported and patched by Mariusz Maximus

I overlooked this one while fixing up for win64 compiling, because I had already manually created this directory.
2010-09-02 22:04:33 +00:00
Nathan Letwory
94d4ff6423 remove debug prints 2010-09-01 06:51:20 +00:00
Nathan Letwory
5241c27594 Python library copying hack.
When creating project files the multi-configuration generator is used. CMAKE_BUILD_TYPE is then not set, so always release libs were copied.
For now copy both release and debug.
2010-09-01 06:19:38 +00:00
Nathan Letwory
3de9aa38cd * Don't use /ZI when 64bit building on Windows. Use /Zi instead.
* Copy files to ${BLENDER_VERSION} instead of .blender/
* Don't try to copy iconv.dll when 64bit building on Windows - it is static for 64bit.
2010-09-01 05:39:26 +00:00
Campbell Barton
77c7e10e9c apply scons change from r31616 to cmake. 2010-08-27 22:53:48 +00:00
Campbell Barton
6464718083 rename some cmake build targets 2010-08-24 04:29:23 +00:00
Brecht Van Lommel
27a0b9bef3 Fix #23099: cmake/mac did not copy the scripts/ directory correct for install. 2010-08-04 16:05:19 +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
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
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
Campbell Barton
00149cfb9d patch [#23041] CMake WITH_PYTHON_INSTALL option
from Dan Eicher (dna)

--- snip ---
Adds the option to not copy python into the .blender/python directory.

Also fixes the problem of deleting the blender installed python where the blender runtime only looks for the copied python and not the system one but not entirely sure why, something to do with CMake hardcoding the PYTHONPATH and PYTHONHOME vars I suppose.

This patch only applies to the 'UNIX AND NOT APPLE' platforms but, then again, those are the only ones anyone really
cares about...or at least the only ones where using the system python is really viable.
2010-07-26 23:16:21 +00:00
Campbell Barton
f30c12bcab patch [#23039] cmake install taget fix for brush icons on linux
from Ralf Hölzemer (cheleb)
2010-07-26 19:59:33 +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
Campbell Barton
0a2e485926 move the thumbnailer to bin/ 2010-07-18 11:46:25 +00:00
Campbell Barton
40078f22b2 CMake on unix
- install manpage into the correct location defined: http://www.pathname.com/fhs/2.2/fhs-4.11.html
- dont copy pyc files from release/scripts
2010-07-17 21:11:04 +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
Campbell Barton
834f2a42ce - sequencer wasnt drawing handles, the deprecated v2d was being used which gave a pixely of -nan.
- removed bf_editors from cmake since there now split up.
2010-07-11 12:39:50 +00:00
Campbell Barton
66a72343ef fix for building with cmake 2010-07-04 22:43:51 +00:00
Andrea Weikert
ca81aa704e Patch [#22339] File/installation paths changes
Patch Tracker: http://projects.blender.org/tracker/?func=detail&aid=22339&group_id=9&atid=127

This patch implements the proposal outlined here:
http://wiki.blender.org/index.php/Dev:2.5/Source/Installation/Proposal

Original patch by Matt Ebb.
Contributions by Nathan Letwory, Damien Plisson and Andrea Weikert

NOTE:
This is a work in progress commit, some work still needs to be done on the SCons and CMake files for this to work properly, but at least should compile and the files should be created in the right directory.

Commit discussed on IRC with Ton and Campbell.
2010-07-04 15:35:23 +00:00
Campbell Barton
d153c765bc CMake:
- WITH_LCMS added option, was supported in scons.
- commented web plugin option since its not maintained.
- some formatting changes and removed includes that are not needed for source/creator/CMakeLists.txt.
2010-06-06 13:32:58 +00:00
Campbell Barton
55d3a2014c have cmake build editors as different libs like scons and nan-makefiles 2010-06-04 11:34:57 +00:00
Campbell Barton
40d7eac69e [#21842] Beta patch to restore cmake MinGW compilation
from Riakiotakis Antonis (psy-fi) 

with modifications.

notes:
- needed to remove quotes around filepaths for copying.
- WITH_JACK, doesnt link
- WITH_FFMPEG, doesnt build
- WITH_RAYOPTIMIZATION, gave an error for me. (no mmx support)
2010-05-28 21:25:23 +00:00
Matt Ebb
2be851c966 Blender TIFF support
* Removed dynamic linking libTIFF code and change it to static linking 
(built into the blender executable). Dynamic linking made things a 
fair bit more complicated and wasn't working at all before on OS X - 
the dylib didn't exist and wasn't being copied. Since TIFF is more heavily
depended upon now in Blender, it makes sense to make it less 'optional'
and more in line with other libraries.

I've updated both CMake and scons, and CMake on OS X/64bit works fine.
It's now up to other platform/build system maintainers to enable this for 
their respective platforms (Campbell will check it for linux). For windows,
and non-64bit osx, we need static libtiff libraries in /lib.

I've added options WITH_TIFF for CMake and WITH_BF_TIFF for scons,
so if blender won't build because of this, you should be able to disable 
these options until your build system has been updated.

* Bonus feature: while doing this, I added support for loading 16bit and 32bit 
per channel TIFFs - they get converted to Blender's float buffers. Handy for 
zbrush displacement maps!
2010-05-21 03:25:38 +00:00
Campbell Barton
b37ae4a375 re-arrange modifier and blenkernel to overcome some linking problems that stopped modifiers being able to build when using some blender-kernel defined stuff 2010-04-25 01:10:03 +00:00
Brecht Van Lommel
9a85013692 Merge various small changes from render branch:
* Division by zero fix for TNT SVD code.
* Sound fix, in case ffmpeg decode fails, don't use the samples.
* Fix for incorrect bounds of transformed objects in new raytracing code.
* Gave memory arena's a name used for allocations for easier memory
  usage debugging.
* Dupligroup no_draw option was using layers but not restrict view/render
  setting. (not a bugfix exactly but would do display list context switching
  while drawing for no reason).
* Fix objects instanced on hair particles not giving consistent results
  when the object is transformed.
* New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4,
  mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4.
* mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple
  arguments.
* endjob callback for WM jobs system.
* Geometry node uv/color layer now has search list/autocomplete.
* Various small buildsystem tweaks, not strictly needed yet in trunk.
2010-04-15 10:28:32 +00:00
Campbell Barton
3fdaf5cecc [#14437] Modifier Stack Refactor
patch by Ben Batt (artificer)

Updated patch for 6 or so modifiers added since the patch was written.

- tested with CMake and SCons
- fixed one error were flags were being added to the fluids type.
- remove BKE_simple_deform.h, simple_deform.c, move functions into MOD_simpledeform.c since there were problems with circular deps.
- moved some fluid and boolean functions used by modifiers too.
2010-04-11 22:12:30 +00:00
Campbell Barton
081c1205a3 correct fsf address 2010-02-12 13:34:04 +00:00
Campbell Barton
25183b8747 adding back quotes, looks like well need to strip them some other way 2010-02-02 13:58:42 +00:00
Arystanbek Dyussenov
2047929e2d Bug in cmake broke vc build. Fixed by Jerome Lelong on ML. 2010-02-02 13:54:01 +00:00
Campbell Barton
fd3842f3a2 Mathutils doc improvements + other small things
- bpy.app moved into PyStructSequence (used by sys.float_info)
- added buildinfo into bpy.app.build_*
- bpy.ui removed (wasnt used)
- include external example files in Mathutils docs (only Mathutils and Vector are currently written)
- added support to auto document PyStructSequence's
- CMake had "'s inside all its strings.
2010-01-31 21:52:26 +00:00
Benoit Bolsee
58fd865744 CMake: fix MSVC debug build crash at startup when ffmpeg enabled.
A wrong libraries link order was causing this problem for
some reason. Since a sorting algorithm for linked libraries
was already implemented in Unix, I just enabled it for Windows.

Note about CMake 2.6.0: The Link Library Dependencies option
(Linker General settings panel) is automatically enabled, which
causes the Blender libraries to be linked twice because CMake
will also add them in the Additional Dependencies field.
CMake 2.8.0 does not have this problem, please upgrade if you
are still using CMake 2.6.0.
2010-01-26 22:49:59 +00:00
Benoit Bolsee
42baabba5d Fix link libraries for Win32 Cmake debug build. Unfortunately, debug builds are still crashing at startup - need to investigate further. 2010-01-17 19:19:15 +00:00
Brecht Van Lommel
1e40adddc7 2.5 Modifiers: mesh deform, boolean and decimation work again. 2009-11-05 18:05:55 +00:00
Arystanbek Dyussenov
31258507d0 Merge of the COLLADA GSoC branch into trunk.
COLLADA code is disabled by default (it has dependencies requiring manual install).

SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch.

The detailed command log of the merge (can be useful for educational purposes):

branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
Damien Plisson
21757e1161 Cocoa / Mac:
- use Cocoa function to convert keys character value to isoLatin-1 encoding instead of the translation table. Works better with international keyboards

- enable stereo GL option

- fix source/creator CMake file to remove unneeded folders in the app bundle (the __MACOSX stuff). (Thx jensverwiebe)
2009-10-26 08:43:24 +00:00
Damien Plisson
068ab484ac Cocoa / Mac:
- tablet : fix pressure retrieval => value sliding now works with tablet, UV-painting is pressure sensitive, and no more crash when clicking on window minimize button with the tablet

- update CMake file to remove unneeded folders in the app bundle (the __MACOSX stuff). From Jens' patch
2009-10-23 12:12:44 +00:00
Damien Plisson
8d7c69ffa9 CMake files update to allow use of MAC OSX 10.5 libs (and build 64bit blender on mac)
The WITH_LIBS10.5 option switches the use of the libs included in the darwin-9.x.universal folder

Use the CMAKE_OSX_ARCHITECTURES variable to set the architecture you want to build for (e.g. i386, x86_64). Only one at a time, this value is used to select the python_?.zip that is bundled with the app.

WITH_COCOA (build Cocoa ghost and not Carbon) is now on by default.
2009-10-19 14:38:19 +00:00
Campbell Barton
492c545e05 only link against python when its enabled
remove duplicate linking flags (looks like a copy/paste error)
2009-10-01 11:21:40 +00:00
Brecht Van Lommel
704a677498 Fix for CMake/OS X, would fail to copy files to bundle sometimes,
doing make twice would avoid this, but that's not very convenient.
2009-09-29 09:48:30 +00:00
Campbell Barton
2d797f35d8 - removed 2.4x release/scripts
- moved release/io and release/ui into release/scripts/io, ui
- updated scons, cmake, make

When porting 2.4x scripts back, use a command like this so as not to loose the commit history...
 
 svn cp https://svn.blender.org/svnroot/bf-blender/branches/blender2.4/release/scripts/raw_import.py release/scripts/io/import_raw.py
2009-09-28 03:19:52 +00:00
Campbell Barton
9f6566c0a5 removed double library entries without realizing I had the BGE disabled, these are needed. 2009-09-25 16:27:12 +00:00
Campbell Barton
38ae41f94e fix for buildinfo on mac's 2009-09-25 13:09:18 +00:00
Campbell Barton
5fdb839865 needed for linking with cmake on unix 2009-09-25 01:49:06 +00:00
Campbell Barton
a8bb313629 add buildinfo to cmake (no win32 support) 2009-09-24 15:36:00 +00:00