Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
29,400 Commits 2 Branches 0 Tags
003ab20292924b829a20ec852188e0e18154f3ef
Commit Graph

221 Commits

Author SHA1 Message Date
Tamito Kajiyama
003ab20292 Merged changes in the trunk up to revision 35618. 
Conflicts resolved:
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_main_api.c
 2011-03-19 00:05:30 +00:00
Campbell Barton
58c8dca7a6 missed removing WITH_INSTALL reference. 2011-03-17 09:09:48 +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
Brecht Van Lommel
c13947fe33 Fixes for GNUmakefile on Mac: 
* Don't use "make install", doesn't work yet.
* Use total number of cores rather than number of processors.
* Quicker number of cores query, by not asking for all system info.
 2011-03-14 15:40:07 +00:00
Campbell Barton
ca95a6f415 - lightmap pack wasnt reporting no mesh errors properly. 
- cleanup headers.
- cmake on *nix was always writing to /bin/./2.56
 2011-03-13 06:02:20 +00:00
Tamito Kajiyama
c8deda3276 Merged changes in the trunk up to revision 35505. 
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
 2011-03-13 02:10:39 +00:00
Nathan Letwory
2336612075 Fix small error in chdir + cmd combination. 2011-03-10 00:21:36 +00:00
Nathan Letwory
4ef2d32b72 untarring of Python 3.2 tarballs would fail if CMake was installed into path with spaces. Slightly 
change how the extraction commands are presented (old BUILD_TYPE was empty all the time here) and
ensure also that python/lib subdir under versioned dir gets actually created.
 2011-03-10 00:12:06 +00:00
Nathan Letwory
239a6f9de7 Some small fixes to the install part for windows. 2011-03-09 22:45:43 +00:00
Campbell Barton
63e37a6133 - CMake, print message to run 'make install', this is new and should help avoid confusion: [#26425] SVN release can't find scripts/modules and doesn't start properly 
- remove extension from icon to match spec: http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.htm
 2011-03-09 21:19:15 +00:00
Nathan Letwory
58fbef0a19 Don't try to copy gnu_gettext.dll when building 64bit Blender - it's linked statically on win64. 2011-03-09 20:58:26 +00:00
Campbell Barton
b3ad45aef6 CMake 
- temp disable installing plugins dir, since its not used for 2.5x
- OSX wasnt getting text copied.
 2011-03-09 00:23:26 +00:00
Campbell Barton
95ed5355b7 CMake: removed blenderplayer from install target by accident with recent commit. 2011-03-08 09:01:22 +00:00
Damien Plisson
df3688a05d CMake/OSX: Bugfix [#26375]: Add default values for the OSX architecture: x86_64 (also used to select the python dynlibs that'll be bundled with the application). 
Set deployment target to be 10.5 by default.

Fix broken build introduced by recent source/creator/CMakeList.txt cleanup
 2011-03-07 21:28:36 +00:00
Campbell Barton
e7bf671e25 se BLI_snprintf() for msvc compat, cleanup CMake file, some bad comments left in. 
also on only try build RPM's on linux.
 2011-03-07 03:57:04 +00:00
Campbell Barton
e1649ecda9 use install target for CMake Windows (msvc and mingw), for MinGW you now need to run 'make install', for MSVC the 'INSTALL' target needs to be enabled in the project file 2011-03-07 03:33:33 +00:00
Tamito Kajiyama
33efa9eeb6 Merged changes in the trunk up to revision 35367. 
To branch builders: From this revision Python 3.2 will be used.
Don't forget svn update in the "lib" directory as well.
 2011-03-06 12:13:32 +00:00
Campbell Barton
6106d919c3 CMake: Linux/Unix Only, 
use 'install' target rather then copying files with post-build commands.

Main change is that you need to run 'make install', which copies files to ./bin by default
unless WITH_INSTALL_PORTABLE is OFF, where CMAKE_INSTALL_PREFIX is used for a typical unix-system install.
 2011-03-06 11:41:30 +00:00
Nathan Letwory
9834aea031 Forgot this one from previous commit. 
For now people should extract the python32(_d).zip in the lib/win*/release dirs into similarly named directories.
 2011-03-04 14:16:43 +00:00
Campbell Barton
244f456a3c fix for error in recent cmake edits 2011-03-01 07:21:52 +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
Andrea Weikert
7ddfd39b28 == CMake Win == 
* remove copying of libjack dll's, libjack is statically linked now.
 2011-02-27 18:47:03 +00:00
Tamito Kajiyama
63b31ef91b Merged changes in the trunk up to revision 35203. 
Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c
 2011-02-26 20:21:09 +00:00
Campbell Barton
18c7354bd2 remove warning left in by mistake and comment unused function. 2011-02-25 02:27:54 +00:00
Campbell Barton
b8e3f4ee30 fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision. 2011-02-24 17:57:35 +00:00
Campbell Barton
d13470ba72 patch from sambler on irc, writes version info for OSX. 2011-02-22 06:05:08 +00:00
Campbell Barton
9ef0eed4b6 build python module without binreloc, add dummy argv[0] to initialize bprogname. 2011-02-21 13:13:08 +00:00
Nathan Letwory
ef60ae9521 And the last one. hopefully. 2011-02-21 13:00:38 +00:00
Campbell Barton
c30149991c Experimental option to build blender as a python module, rather then blender embedding python. 
CMake build option WITH_PYTHON_MODULE, will build ./bin/bpy.so

This allows 'bpy' to be imported from python or other applications/IDE's which embed python, eg:
   python -c "import bpy ; bpy.ops.render.render(write_still=True)"

This runs in background mode and has similar restrictions to running a script:
   blender --background --python test.py

TODO:
 - install to site-packages with blender scripts
 - add support for imp.reload()
 2011-02-20 23:39:29 +00:00
Campbell Barton
06aee2ef0e misc warnings/fixes 
- WITH_OPENJPEG wasn't defined for creator.c with CMake.
- remove shadowed/redefined vars.
- remove some unused RNA report args.
- re-arrange IMB_FILE_TYPES so IRIS is not the first format tested, since its not very common test JPEG and PNG first.
 2011-02-20 15:48:01 +00:00
Tamito Kajiyama
70aa63306a Merged changes in the trunk up to revision 34996. 
Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript
 2011-02-19 23:51:18 +00:00
Campbell Barton
f94256ea5c fix for building with make on linux from recent new lib. 2011-02-15 12:37:15 +00:00
Tamito Kajiyama
3789c398ff Merged changes in the trunk up to revision 34828. 
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
 2011-02-13 23:47:30 +00:00
Campbell Barton
711ba795f7 ignore __pycache__ dir for scons and cmake installation (py3.2 caches modules here). 2011-02-09 00:45:16 +00:00
Tamito Kajiyama
4e9a519e22 Merged changes in the trunk up to revision 34574. 2011-01-30 23:41:58 +00:00
Campbell Barton
d75216ba1c - fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over. 
- move test -> tests, this name is used elsewhere in lib/tests.
- change interface code not to loop on a float value (clang warning), harmless, but with extreme cases an eternal loop would still be possible though unlikely.
 2011-01-23 11:42:29 +00:00
Tamito Kajiyama
0ec378f3fe Merged changes in the trunk up to revision 34193. 
Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h
 2011-01-09 15:07:14 +00:00
Campbell Barton
96b646c68d edits for BPY_extern.h functions, no functional changes 
- remove unused code.
- BPY_run_python_script() split in 2, BPY_filepath_exec, BPY_text_exec
- renamed funcs.
 2011-01-05 02:08:54 +00:00
Tamito Kajiyama
3ead3c4ff3 Merged changes in the trunk up to revision 33894. 
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:

  blender_include_dirs(${OPENGL_INCLUDE_DIR})

The command above should be:

  blender_include_dirs("${OPENGL_INCLUDE_DIR}")
 2010-12-27 01:38:23 +00:00
Guillermo S. Romero
29799bf09c Compact -I paths in makefiles for more readble files/output. 
Also some white space cleaning and removal of redundant parameter.
 2010-12-22 22:15:20 +00:00
Campbell Barton
da153a509b CMake RelWithDebInfo uses python31.dll, not python31_d.dll 2010-12-19 16:09:24 +00:00
Tamito Kajiyama
3368a595da Merged changes in the trunk up to revision 33765. 2010-12-18 11:49:12 +00:00
Campbell Barton
5c621bd7f5 cmake was complaining when there was no libs skipped. 2010-12-17 04:41:48 +00:00
Campbell Barton
566bda734a last commit to fix warnings didnt set them at all, not it works as it should. 
also made cmakes output a lot quieter, messages can be uncommented for debugging or added back if other devs need this for some reason.
 2010-12-16 12:48:30 +00:00
Campbell Barton
afacd18498 use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed. 2010-12-08 08:43:06 +00:00
Campbell Barton
d64f46e0bb CMake: use a global list to store libraries built rather then cmake_blender_libs.txt file. 2010-12-06 10:56:37 +00:00
Tamito Kajiyama
8a2eb1f590 * Merged changes in the trunk up to revision 33492. 
* Fixed a bug in listing all style modules in source/blender/blenlib/intern/bpath.c.
 2010-12-06 01:23:18 +00:00
Campbell Barton
42d6603cae Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options. 2010-11-30 18:52:39 +00:00
Campbell Barton
e8397e6193 include headers in cmake source, added a script to check for consistency, reporting missing headers & C files. 
this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.
 2010-11-29 04:35:56 +00:00
Tamito Kajiyama
a04603d2a0 Merged changes in the trunk up to revision 33348. 2010-11-27 12:48:35 +00:00