Commit Graph

221 Commits

Author SHA1 Message Date
Campbell Barton
837fedf372 fix for building with mingw/cmake 2010-11-22 23:25:21 +00:00
Campbell Barton
94e17ff01e fix for cmake if build flags are not defined. 2010-11-22 23:06:57 +00:00
Campbell Barton
39b7bfe6bd - check IF WIN32 AND NOT UNIX (for cygwin)
- patch from Mike S to enable OpenMP and xcode
2010-11-21 13:41:43 +00:00
Campbell Barton
da1f288f50 rename libs internal libs for CMake + SCons (used in MSVC project files)
for game engine use "ge_" prefix & make names generally more descriptive.
2010-11-18 11:42:05 +00:00
Tamito Kajiyama
43f4dbceb4 Merged changes in the trunk up to revision 32886. 2010-11-05 21:49:36 +00:00
Campbell Barton
6b767b8018 fix [#24499] Consistency Issue with LassoSelect/ExtendOption
Added extend option to lasso. 

also...
- selecting bones wasn't checking their layer of if they were hidden in a number of places.
- fixed memory leak.

small unrealed changes
- added PBONE_VISIBLE macro
- renamed functions used for paint selectoin from *_tface to paintface_*. sine they no longer have anything todo with tface's.
- removed scanfill include from BLI_blenlib.h, this is only used in very few places and quite specific.


Noticed lasso select is broken for metaballs and face mask mode but this has been the case for a while, will look into it next.
2010-11-03 01:56:02 +00:00
Campbell Barton
0876fce009 rename and negate DISABLE_PYTHON --> WITH_PYTHON 2010-10-31 04:11:39 +00:00
Campbell Barton
50dab4fc37 rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE 2010-10-31 03:20:33 +00:00
Campbell Barton
bae43df4ec building the BGE without bullet works again. 2010-10-31 01:04:31 +00:00
Campbell Barton
7f5abb7fe2 dont build blender/kernel if the game engines disabled. 2010-10-31 00:56:46 +00:00
Tamito Kajiyama
3b2515ba0e Merged changes in the trunk up to revision 32684. 2010-10-24 13:05:09 +00:00
Campbell Barton
05b297c52f CMake options to disable Decimate and Boolean Modifiers: WITH_MOD_BOOLEAN, WITH_MOD_DECIMATE, renamed WITH_FLUID to WITH_MOD_FLUID 2010-10-23 15:40:13 +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
Tamito Kajiyama
894daa01be Merged changes in the trunk up to revision 32565. 2010-10-18 20:40:43 +00:00
Campbell Barton
799fc68234 cflags, cxxflags & linkflags in buildinfo. 2010-10-18 12:56:14 +00:00
Campbell Barton
bc1cca8d00 - blender player builds again with CMake.
- remove duplicate entries for libs for blender binary (where possible)
2010-10-16 09:27:02 +00:00
Luca Bonavita
9f05cc59fa == docs ==
- moved files in proper directories and adapted paths where needed
- deleted doc/oldbugs.txt (asked confirmation to jesterking a week ago in irc)
- still working on doxygen files, for now I'll leave them in doc/
- NOTE: while checking if other files were referring to these files, I noted that
  "GPL-license.txt" is also used in the files below:
    - release/windows/installer/00.sconsblender.nsi
    - release/windows/specific.sh
  but these files should't be affected by this commit, but please check :)
2010-10-13 14:44:22 +00:00
Tamito Kajiyama
d7cd6e349d Merged changes in the trunk up to revision 32390. 2010-10-09 22:30:01 +00:00
Campbell Barton
459cf92bf4 build-fix [#24142] path changes break osx 2010-10-05 10:23:25 +00:00
Campbell Barton
0540512866 fix for building over samba /w cmake+mingw 2010-10-04 00:40:48 +00:00
Tamito Kajiyama
854ef17700 Merged changes in the trunk up to revision 32271. 2010-10-03 11:33:32 +00:00
Nathan Letwory
6e41dc8571 CMake on Windows for project files will now copy correct python dll and correct python modules in place. 2010-09-29 11:09:11 +00:00
Tamito Kajiyama
28d618e41b Merged changes in the trunk up to revision 31987. 2010-09-18 00:50:13 +00:00
Campbell Barton
4e9c329faf patch [#23855] fix CMakeList.txt for WITH_QUICKTIME
from Filiciss Muhgue (filiciss)
2010-09-17 16:54:59 +00:00
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
Tamito Kajiyama
fdb4b0c3ed Merged changes in the trunk up to revision 31880. 2010-09-11 11:16:55 +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
Tamito Kajiyama
9c6feb1987 * Merged changes in the trunk up to revision 31789.
* Made a local fix for a compilation error with VC++ 2008 and
CMake, reported to the bf-committers mailing list:
http://lists.blender.org/pipermail/bf-committers/2010-September/028643.html
2010-09-06 23:26:36 +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
Tamito Kajiyama
12f9a5de5b Merged changes in the trunk up to revision 31630. 2010-08-28 14:30:52 +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
Tamito Kajiyama
f5247d9425 Fix for a linkage issue with CMake on Linux. 2010-08-18 04:15:14 +00:00
Tamito Kajiyama
dd75ec4907 Merged changes in the trunk up to revision 31190. 2010-08-09 11:32:55 +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
Tamito Kajiyama
be2e221608 Merged changes in the trunk up to revision 30781. 2010-07-27 00:08:15 +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
Tamito Kajiyama
e423e085f8 Merged changes in the trunk up to revision 30551. 2010-07-20 19:39:07 +00:00
Campbell Barton
0a2e485926 move the thumbnailer to bin/ 2010-07-18 11:46:25 +00:00