bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
40,376 Commits 2 Branches 0 Tags 745 MiB
1a5998bc4e
Commit Graph

541 Commits

Author SHA1 Message Date
Campbell Barton
7ef5464236 sse flags for intel c++ compiler 2011-09-30 16:37:46 +00:00
Campbell Barton
cf3956f450 formatting edits only 2011-09-30 15:51:58 +00:00
Campbell Barton
f3ae228c9d minor changes, dont append with cmake platform flags which is a string and use enum values rather then ints in a few places. 2011-09-30 15:22:13 +00:00
Thomas Dinges
5689467b9a Cycles: 
* Use different Boost versions for x86/x64 windows. 
Will commit OIIO and Boost for x64 windows later, needs more testing.
 2011-09-27 21:25:25 +00:00
Campbell Barton
f4dec97cef fix for building on windows, clear some warnings too 2011-09-27 01:32:27 +00:00
Campbell Barton
fc8a7aba55 comment -Wundef for cmake default flags, this causes too many warnings with mingw. 2011-09-26 09:43:35 +00:00
Campbell Barton
274b9c8fb8 whitespace cleanup 2011-09-25 12:31:21 +00:00
Brecht Van Lommel
153e4cad4b Cycles: svn merge -r40266:40358 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-19 14:20:15 +00:00
Campbell Barton
83a2f02a78 cleanup endian handling 
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
 2011-09-19 08:02:17 +00:00
Brecht Van Lommel
61f77fffac Cycles: fix openimageio build issues on mac/linux. 2011-09-18 15:00:39 +00:00
Campbell Barton
08d52fcc85 added FindOpenImageIO cmake module. 2011-09-18 04:55:22 +00:00
Brecht Van Lommel
f4a9215d7c Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender 
Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.
 2011-09-17 13:28:40 +00:00
Sergey Sharybin
86d05b3144 Update build rules to deal with new gettext libraries. 2011-09-15 11:37:42 +00:00
Campbell Barton
297f14a1d6 fix for error linking opencollada on linux. 2011-09-12 13:58:13 +00:00
Brecht Van Lommel
ebc653463d Cycles: 
* Fix missing update when editing objects with emission materials.
* Fix preview pass rendering set to 1 not showing full resolution.
* Fix CUDA runtime compiling failing due to missing cache directory.
* Use settings from first render layer for visibility and material override.

And a bunch of incomplete and still disabled code mostly related to closure
sampling.
 2011-09-12 13:13:56 +00:00
Campbell Barton
c61827ed25 patch from Uncle_Entity on IRC for fedora/collada 2011-09-08 03:57:11 +00:00
Brecht Van Lommel
6b134ae357 Cycles: set minimum required boost version lower. 2011-09-06 17:48:06 +00:00
Antony Riakiotakis
aabd702dbd fix link issues with MinGW - a substitute declaration(correctByteOrder) for itoln that was not present in MinGW was being used. Duplicated the declaration from <winsock2.h>(tried including but gave some errors) and added the appropriate link library, wsock32, according to MinGW documentation. 2011-09-06 11:17:29 +00:00
Campbell Barton
0991bed413 fix some complier warnings and add -Wundef to CMake's default GCC warnings. 2011-09-05 23:40:52 +00:00
Antony Riakiotakis
6edb09fe93 Compile fixes for MinGW, checked with basic initial setup, no CUDA, gcc 4.5.2. 
OpenImageIO still gives link-time errors, will try to make a lib for MinGW, see if it is fixed.
 2011-09-04 15:39:09 +00:00
Brecht Van Lommel
1135875ab1 Cycles: 
* Fix crash in light path node
* Fix struct alignment issue for cuda
* Fix issue with instances taking up too much memory
* Fix issue with ray visibility working incorrect on some objects
* Enable OpenCL always and remove option, it has no dependencies so may as well
* Refuse to load kernel if OpenCL version < 1.1, recent drivers are needed
* Better error handling for OpenCL device
* 3D views with rendered draw mode will now revert to wireframe on file load
 2011-09-02 14:55:06 +00:00
Brecht Van Lommel
b56ffd2cdb Cycles: svn merge -r39669:39870 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-02 12:33:29 +00:00
Thomas Dinges
fefbdc4376 Cycles: Remove warning of OpenCL not working from cmake, could be made enabled by default too, but will leave that for Brecht. :) 2011-09-02 00:53:00 +00:00
Campbell Barton
2365c64014 whitespace bge edits 2011-09-01 02:12:53 +00:00
Campbell Barton
681d073d94 mistake in own recent commit broke op[encollada with mingw 2011-08-27 08:19:26 +00:00
Brecht Van Lommel
dc557b7440 Cycles: linux build tweaks to allow static oiio/boost build. 
Wiki build instructions have been updated to do static linking now:
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/Cycles/Building
 2011-08-24 19:21:04 +00:00
Campbell Barton
9ad6434c4e opencollada find module. hopefully solves the problem where includes can in an /include subdir or not. 2011-08-24 16:04:35 +00:00
Brecht Van Lommel
29bdf37f9d Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 09:44:08 +00:00
Campbell Barton
8470418b91 cmake: skip rpath (paths to libs) for portable distrobution 2011-08-23 20:19:08 +00:00
Sergey Sharybin
a33a26ca07 FFmpeg library update: 
- Update scons/cmake rules to use new versions of libs/dlls.
- Update rules for buildbot.
 2011-08-22 18:49:42 +00:00
Campbell Barton
817273931a buildinfo is now quoted from the build systems, avoids stripping quotes on startup. 
tested with linux/cmake linux/scons windows/cmake/mingw windows/cmake/msvc
 2011-08-22 12:24:14 +00:00
Campbell Barton
bebee3fb60 new cmake doesn't consider CLang == GNUCC, set flags for clang explicitly. 2011-08-21 11:06:49 +00:00
Brecht Van Lommel
f7b9c85871 Cycles: fix some invalid memory access problems found by running the windows build in debug mode. 2011-08-21 10:32:15 +00:00
Brecht Van Lommel
c7fce6be2e Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-16 18:59:45 +00:00
Brecht Van Lommel
360fcd73fe Cycles: 
* add some (disabled) test code for using OpenImageIO in imbuf
* link cycles, openimageio and boost into blender instead of a shared library
* some cmakefile changes to simplify the code and follow conventions better
* this may solve running cycles problems on windows XP, or give a different
  and hopefully more useful error message
 2011-08-16 16:15:34 +00:00
Campbell Barton
bf23acf3bb fix for building ndof with cmake on osx 2011-08-07 15:06:35 +00:00
Brecht Van Lommel
ec26abd2db Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-07 13:21:04 +00:00
Campbell Barton
48a699d15b enable NDOF by default with cmake again, but check if it can be found on OSX, if not disable. 
I cant test this but at least if I made a mistake it will just not find the SDK and disable. an osx dev needs to test.
 2011-08-03 14:18:02 +00:00
Ton Roosendaal
01b105faa5 Cmake: compile with NDOF default off. This is a dependency on code 
that's not in our svn.
 2011-08-03 13:31:33 +00:00
Kent Mein
b2959e55f5 Fixes an issue with OSX Lion 
Also cleaned up the python detection for OSX 

Kent
 2011-08-02 17:35:07 +00:00
Campbell Barton
baa37b1b46 more cmake/x11 edits 
- added includes for spnav
- added FindSpacenav.cmake which allows using spacenav from a nonstandard path.
- remove NDOF_LIBPATH, use a full library path instead.
 2011-08-02 06:32:53 +00:00
Campbell Barton
fcd7d2b486 NDOF related edits 
- fix for building without NDOF on X11
- quiet some warnings
 2011-08-02 05:52:27 +00:00
Mike Erwin
56918978b7 3D mouse support from merwin-spacenav branch 2011-08-02 04:28:05 +00:00
Mike Erwin
dc2609da3d svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-08-02 01:01:56 +00:00
Campbell Barton
dde50cc39f add sse flags for cmake/msvc 2011-08-01 06:11:41 +00:00
Nathan Letwory
73a9ce7ec0 svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-27 07:42:53 +00:00
Mike Erwin
ff5a49b816 another CMake build fix (contributed by Kevin Cozens) 2011-07-23 21:33:04 +00:00
Campbell Barton
e6604288c8 cmake - option to disable the frame server 2011-07-21 23:06:51 +00:00
Mike Erwin
6cd4716d1a enable CMake builds with spacenav (contributed by Kevin Cozens) 2011-07-21 21:34:28 +00:00
Nathan Letwory
eea7c358c7 svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-21 09:40:59 +00:00
Campbell Barton
2d8c1e60e6 print an error message if Python.h can't be found for cmake and scons since its such a common problem. 2011-07-16 06:55:45 +00:00
Campbell Barton
1fd33b6e77 cmake option to build without smoke sim: WITH_MOD_SMOKE 2011-07-13 18:40:21 +00:00
Campbell Barton
cf485cd963 Advanced CMake option to build the player without blender: WITH_BLENDER 2011-07-13 08:15:06 +00:00
Campbell Barton
44e45e54c5 - don't build ghost's event printer unless ghost debug is enabled. 
- use char rather then STR_String for the event printer.
- added option to build WITH_GHOST_DEBUG for cmake
- renamed WITH_SDL_GHOST --> WITH_GHOST_SDL
 2011-07-13 06:04:54 +00:00
Campbell Barton
f7b9418d25 build option to use SDL 1.3 for GHOST rather then X11/Win32/Cocoa api's, 
This opens up the option for blender to be more easily ported to other devices, OS's.

TODO
- continuous grab.
- text glitch with multiple windows (was a bug in X11 too for a while, will check on this)
 2011-07-12 13:17:54 +00:00
Antony Riakiotakis
add56df7ca -OpenEXR fixed so enabling if user has enabled 
-Added Iex to lib list, was causing link time errors
 2011-07-10 20:04:56 +00:00
Campbell Barton
415761d508 own change to cmake files broke MSVC2010 with Debug configuration, reported by Alex K 2011-07-01 03:40:12 +00:00
Brecht Van Lommel
b1637e3201 Cycles: svn merge -r37904:37957 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-06-29 19:14:37 +00:00
Brecht Van Lommel
6582d30c26 Fix windows cmake build, this line got accidentally removed in variable renaming. 2011-06-29 17:56:32 +00:00
Campbell Barton
8f89e7a309 incorrectly had CMake storing directory names as filepaths 
also correct compiler warning for collada and remove print from own last commit.
 2011-06-29 13:16:11 +00:00
Sergey Sharybin
d8eb704784 Corrected link to FFmpeg homepage. 2011-06-29 09:46:00 +00:00
Campbell Barton
c2bd746fac own error in recent cmake edits 2011-06-28 16:57:25 +00:00
Brecht Van Lommel
3211bea679 CMake: campbell already added default build type as release a few hours 
earlier in a different way, missed that, so reverting my change.
 2011-06-28 15:43:03 +00:00
Brecht Van Lommel
d18d37d25f Cycles: svn merge -r37694:37904 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-06-28 15:00:42 +00:00
Brecht Van Lommel
a05b66defb CMake: set default cmake build type to Release. Without that you would 
get a build that has neither debug symbols nor optimization, now it
will build an optimized blender by default.
 2011-06-28 14:42:11 +00:00
Campbell Barton
c0a83d24e9 cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for debug 2011-06-28 02:49:49 +00:00
Mike Erwin
30b4ff8949 first attempt at CMake fix (untested) 2011-06-27 23:24:24 +00:00
Campbell Barton
e4f7b24e20 disable opencollada and openexr for msvc2010, gives linking errors 2011-06-27 16:33:59 +00:00
Campbell Barton
a961d62653 initialize cmake's CMAKE_BUILD_TYPE to 'Release' 
add reference to cmake cache for convenience GNUMakefile
 2011-06-27 13:18:08 +00:00
Campbell Barton
4b1cceddbd fix for building with msvc/cmake take 2 (think its correct this time) 
also sync build flags with scons.
 2011-06-26 17:18:37 +00:00
Mitchell Stokes
3de7a67562 This solves the issue of having symlinks in the LIBDIR path (CMAKE Windows). Hopefully it doesn't break other things. 2011-06-26 08:42:00 +00:00
Campbell Barton
83000d8504 Allow the lib dir to be a symlink, pointed out by Mitchell Stokes. 2011-06-26 06:05:56 +00:00
Nathan Letwory
e7c6b535b0 Remove unnecessary check. OpenAL, SDL, JACK don't depend on samplerate. 2011-06-23 17:29:18 +00:00
Campbell Barton
0767779387 fix for building mingw in debug mode 2011-06-23 16:33:59 +00:00
Campbell Barton
99253abef8 allow building with ffmpeg but not aud 2011-06-23 16:10:48 +00:00
Campbell Barton
bb3742fe91 correction to recent commit & made ffmpeg includes only add when enabled. 2011-06-23 15:58:41 +00:00
Campbell Barton
c3e48219e6 mistake in own commit. 2011-06-23 15:12:05 +00:00
Campbell Barton
2023db70a8 cmake option to build without an audio library. 2011-06-23 09:27:56 +00:00
Brecht Van Lommel
07dee0d8a6 Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk 2011-06-21 15:47:18 +00:00
Campbell Barton
b1b8284f9b fix for python include in msvc 2011-06-19 15:55:49 +00:00
Campbell Barton
c6eaa2300a cmake: add find jack module 2011-06-19 15:03:50 +00:00
Campbell Barton
a8d4c1f8a9 cmake: add find jemalloc module 2011-06-19 14:55:51 +00:00
Campbell Barton
56c0f69071 fix for building opencollada + msvc 2011-06-19 14:14:29 +00:00
Campbell Barton
29977893d3 since cmake new auto-detects many features, print a summery of the configuration on first run. 2011-06-19 13:49:20 +00:00
Campbell Barton
6790dbe9db cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables. 2011-06-19 13:06:21 +00:00
Campbell Barton
77698421b3 fix for building with msvc 2011-06-19 10:19:10 +00:00
Campbell Barton
def6bcd4e5 cmake add module for finding fftw3. 
also allow debug blender to build with non debug python
 2011-06-19 08:57:34 +00:00
Campbell Barton
167bcc2b67 cmake: add libsamplerate find module 2011-06-19 08:20:02 +00:00
Campbell Barton
b15a2b0ffc cmake: added FindOpenJPEG module. 2011-06-19 07:46:24 +00:00
Campbell Barton
145944d66f cmake: 
new macro file_list_suffix() for adding a suffix to every file in a path before the file extension.
 useful to create names for debug libs on windows.
 2011-06-19 06:57:56 +00:00
Campbell Barton
2c68bdb03e cmake: make python search into a find package module. 2011-06-18 15:53:47 +00:00
Campbell Barton
968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +00:00
Campbell Barton
549c2c58a1 added FindSndFile cmake module to replace inline checks. 2011-06-18 12:12:19 +00:00
Campbell Barton
1356082063 fix [#27681] Python: crash assigning a 'set' to an array 2011-06-17 02:22:38 +00:00
Campbell Barton
c02121b708 use full library paths for openexr & msvc, also remove unneeded exr includes 2011-06-15 13:54:57 +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
Brecht Van Lommel
c5e63925db Cycles: svn merge -r37040:37333 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ 2011-06-09 14:53:25 +00:00
Campbell Barton
9dd066eb65 cmake: remove python include in the wm module, set opengl as a system include. 2011-06-08 05:39:58 +00:00
Campbell Barton
42ece56e91 don't write file history in backgound mode (running ctest would overwrite all my recent-files.txt), and add an error about mingw/quicktime being unsupported. 2011-06-08 01:53:12 +00:00
Campbell Barton
4a59928484 CMake option 'WITH_HEADLESS' to build blender in headless mode (no x11/xlib) with NULL ghost classe. 2011-06-04 14:12:55 +00:00
Brecht Van Lommel
6a128eee7b Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ 2011-05-31 09:51:46 +00:00
M.G. Kishalmi
9b5800bcd7 fixed "rather then" -> "rather than" typos all over the place 2011-05-28 13:11:24 +00:00
Campbell Barton
2ccdcca7f5 fix for option WITH_CXX_GUARDEDALLOC with msvc 2011-05-24 06:44:39 +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
Brecht Van Lommel
88d9d89c97 Cycles: svn merge -r36495:36747 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ 2011-05-18 13:56:20 +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
Campbell Barton
424a0cca27 option to link with jemalloc on *nix, off by default. 2011-05-12 11:16:32 +00:00
Campbell Barton
1e0c3d315b minor cleanup, no functional changes. 2011-05-09 14:41:44 +00:00
Brecht Van Lommel
b25346a48c Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ 2011-05-05 10:14:56 +00:00
Campbell Barton
07ee0dcc74 build system changes to eltopo, re-applied. 2011-05-02 03:44:02 +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
Brecht Van Lommel
774584d7e8 Cycles: hook up the CMake build system. 
New build instructions for Ubuntu Linux in the wiki:
http://wiki.blender.org/index.php/Dev:2.5/Source/Cycles
 2011-04-28 13:47:27 +00:00
Campbell Barton
11305bd688 CMake build option for security report: CVE-2009-3850 
Nothing is changed by default but some linux distributions want to have executing python be opt-in.

This keeps the same functionality but disables auto-run from factory settings and in background mode unless its enabled as a command line argument.

This CMake option is marked as advanced and wont show in the regular options list so its less likely to be enabled by people that like to turn everything ON without reading descriptions :)
 2011-04-28 06:20:47 +00:00
Brecht Van Lommel
4e235c184b Blender modifications for Cycles integration. 
Some notes about code status:

* The Blender modifications were fairly quickly put together, much more code
  polish and work is needed to get this to a state where it can be committed
  to trunk. Files created with this version may not work in future versions.

* Only simple path tracing is supported currently, but we intend to provide
  finer control, and more options where it makes sense.

* For GPU rendering, only CUDA works currently. The intention is to have the
  same kernel code compile for C++/OpenCL/CUDA, some more work is needed to
  get OpenCL functional.

* There are two shading backends: GPU compatible and Open Shading Language.
  Unfortunately, OSL only runs on the CPU currently, getting this to run on
  the GPU would be a major undertaking, and is unlikely to be supported soon.
  Additionally, it's not possible yet to write custom OSL shaders.

* There is some code for adaptive subdivision and displacement, but it's far
  from finished. The intention is to eventually have a nice unified bump and
  displacement system.

* The code currently has a number of fairly heavy dependencies: Boost,
  OpenImageIO, GLEW, GLUT, and optionally OSL, Partio. This makes it difficult
  to compile, we'll try to eliminate some, it may take a while before it
  becomes easy to compile this.
 2011-04-27 14:36:02 +00:00
Campbell Barton
6bb626f253 minor changes 
- remove some warnings
- fix typos
- cmake allow in-source build (when WITH_IN_SOURCE_BUILD is defined)
- cmake, use an explicit list of rna files (don't glob)
 2011-04-21 05:49:47 +00:00
Campbell Barton
2d1e663440 patch [#26861] Spelling, Typos, and Grammar 
- also fix own bad assert from yesterday & remove testing cmake print.
 2011-04-11 01:18:25 +00:00
Sergey Sharybin
1c11e40cb7 Use the same LLIBS set for cmake at Win64 platform as scons uses. 
This fixes linking errors occurred recently for me (kinda of SDL
and registry stuff)

Now it works perfectly, thanks to Campbell for tip :)
 2011-04-10 14:44:57 +00:00
Campbell Barton
74f3d03969 disable new cloth solver by default. 2011-04-10 06:06:26 +00:00
Campbell Barton
7aed432fc8 eltopo cloth solver couldnt be enabled from cmake, also dont use globbing. 2011-04-10 05:43:34 +00:00
Campbell Barton
5457c871ef change in how cmake works with CMAKE_C_STANDARD_LIBRARIES / CMAKE_CXX_STANDARD_LIBRARIES. 
if not defined (first run) these are now set blank but can be defined later.

the problem is that scons & cmake builds would link against different libraries since cmake added its own defaults.
now, by default, scons & cmake have the same libraries.

This fixes an obscure crash in MinGW where cmakes default linking with -ladvapi32 would crash on string formatting which used float precision as an argument, eg:
  printf("%.*f", 3, value);
...without giving a useful backtrace or pointing to the line of code doing the string formatting.
 2011-04-09 11:16:37 +00:00
Campbell Barton
1c8d311287 missed setting WITH_BUILTIN_GLEW on non *nux OS's 
also made WITH_PYTHON advanced.
 2011-04-06 01:51:43 +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
0298d223cc quiet various warnings, also disable -Wdouble-promotion with cmake since it gives warnings with variable length args. 2011-04-03 10:04:16 +00:00
Campbell Barton
cf40220e54 set CMake's GCC warnings for GCC4.6. 
-Wdouble-promotion -Wno-error=double-promotion
 -Wno-error=unused-but-set-variable
 2011-03-28 02:11:51 +00:00
Campbell Barton
06b04fa886 dont return a system path if cmake's 'WITH_INSTALL_PORTABLE' is enabled. this way portable builds wont find scripts in /usr/share. 2011-03-25 05:23:58 +00:00
Campbell Barton
5f8fa29755 add cmake option to build without xinput (tablet support) 2011-03-25 04:56:48 +00:00
Campbell Barton
c210b3991a support for blender as a module on win32. 2011-03-24 00:14:49 +00:00
Campbell Barton
733b736e9e CMake, check for clang++ compiler and disable WITH_IK_ITASC and WITH_MOD_FLUID until there supported. 
possibly allows builing with Xcode4.
 2011-03-20 01:49:15 +00:00
Campbell Barton
879be45bb5 fix for building on ubuntu 11.04 (pre-release), also remove WITH_INSTALL from cache. 2011-03-18 12:12:53 +00:00
Campbell Barton
4f5e20aeb4 remove cmake WITH_INSTALL option since its a target now. 2011-03-16 21:32:20 +00:00
Campbell Barton
6588bcbbe0 CMake, GCC: replace -Werror=strict-prototypes with -Wstrict-prototypes, some external headers cause this. 2011-03-15 22:30:07 +00:00
Campbell Barton
42e9796c04 builder reports MSVC was setting stack size to 2gig. 2011-03-12 04:31:28 +00:00
Campbell Barton
a001b3f072 set 2mb stack for mingw too. 2011-03-12 00:50:34 +00:00
Nathan Letwory
92665b0a51 Fix [#25659] crash when unwrapping specific mesh 
Reported by Jan Hohoho

Running the unwrap causes stack to overflow. Double the size from default 1MB.
 2011-03-11 23:27:15 +00:00
Campbell Barton
9c032756e9 when checking for windows check sys.platform starts with "win" rather then '== "win32"' & avoid importing platform. 
also add some notes to CMake options.
 2011-03-11 01:24:16 +00:00
Campbell Barton
f3a455fd22 CMake should find python now without manual options being set on linux. 
cmake on *nix detects python ABI flags for debug and release mode.
searches /usr /usr/local /opt/py32
 2011-03-10 00:25:35 +00:00
Campbell Barton
17564249bb better default python ABI flags for *nix, 'm' default, 'd' for debug. 
give a CMake error if Python.h isn't found.
 2011-03-09 23:27:26 +00:00
Campbell Barton
65273cf82f - correct python3.1 warning message. 
- for new shadow only enum, use humanly readable RNA enum values.
- update cmake unix example for custom python.
 2011-03-08 22:11:15 +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
cfd9d6d190 Drop support for python 3.1. 
for building py3.2 on *nix see:
  http://wiki.blender.org/index.php?title=Dev:2.5/Doc/Building_Blender/Linux/Troubleshooting#Python

also fixed possible buffer overrun with getting the fake filepath for a blender textblock.
 2011-03-07 11:53:40 +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
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
8bc0033cb0 Move CMake on Windows to use Python 3.2 2011-03-04 14:15:46 +00:00
Campbell Barton
e8c322ee85 Py/RNA API: WITH_PYTHON_SAFETY 
compile time option which enables extra safety checks.
since this is noticeably slower I rather not enable by default yet.
 2011-03-03 12:00:35 +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
32c13137f5 disable some conflicting options WITH_PYTHON_MODULE 2011-02-22 14:27:46 +00:00
Campbell Barton
12e4c52c5a cmake was using dna source list with the variable out of scope, possibly causing dependency problems. 2011-02-22 06:23:07 +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
Campbell Barton
7809d7d0c8 fix [#26152] Blender File for Image too Small 
disallow 0% rendersize.

also mark new cmake vars as advanced: RPMBUILD, X11_XF86keysym_INCLUDE_PATH
 2011-02-21 01:02:30 +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
Guillermo S. Romero
c37884b015 Add XF86keysym.h detection and use to CMake system, for r34983. 2011-02-19 23:51:55 +00:00
Campbell Barton
9ee1b3930f set main() argv functions to be const char * 
also set minimum cmake version to 2.8
 2011-02-19 12:05:20 +00:00
Campbell Barton
c461a7ea4d patch from IRIE Shinsuke, use systems openjpeg on *nix. 2011-02-15 19:04:51 +00:00
Campbell Barton
52c08fa4d3 CPack packaging support from Dan Eicher, tested to build redhat RPM's, a Mac bundle also defined. 2011-02-15 18:33:05 +00:00
Campbell Barton
8ea0b4685c misc small changes: 
- rename rna collection structs Main prefix to BlendData: eg, MainObjects --> BlendDataObjects
- printing python collection now prints its type (when available)
- renamed shadowed vars in bpy_rna.c.
- when making functions static I also made debugging/test functions static, reverse and add definitions to headers instead.
 2011-02-14 03:15:55 +00:00
Campbell Barton
914e2ee01f problem with blender and python 3.2 
- python 3.2 does 'import site' on startup which now tries to parse pyconfig.h which isn't copied. so for now just run without importing 'site', alternative would be to copy the header file for posix systems.
- cache PYTHON_VERSION variable so it can be set to 3.2, needed for copying python installation's other then 3.1.
 2011-02-08 06:22:06 +00:00
Campbell Barton
6165508bc5 patch for building blender with CMake, OpenEXR & MSVC2010 by Peter K?\252mmel 2011-02-07 01:23:18 +00:00
Nathan Letwory
71cb745941 Commit to cope with API changes in OpenCOLLADA (latest for Windows right now r827). 2011-01-27 19:39:06 +00:00
Campbell Barton
1bd0db59f4 use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken. 
in the case of python this makes it easier to move to find_package(PythonLibs) when 3.x is supported.
 2011-01-25 14:43:13 +00:00
Campbell Barton
8a3beb0012 import/export automated testing using CMake's CTest 
Will need to write full docs on this on the wiki.
basic info.
- 21 tests, OBJ/3DS/X3D/FBX, 3 tests per format import export. STL, PLY, BVH are TODO.
- uses files in ../lib/tests (checkout separate)
- run with CMake Makefiles "make test" or "ctest"
- currently checks against basic MD5 hash on scene import and file MD5 hash on export (realize this wont work predictably on binary formats *TODO*).
- currently uses a generic script for all tests with arguments to specify command to run, expected output, testing method, files to check against etc.

Has already proved useful, found a number of bugs in import export and some in blender too.
 2011-01-21 00:06:30 +00:00
Campbell Barton
00b8c9e7ea rename BKE_assert() --> BLI_assert(). 2011-01-09 15:12:08 +00:00
Campbell Barton
54ceccd0ee - cmake use execute_process, exec_program is deprecated. 
- game engine builds without python again.
 2011-01-07 08:43:29 +00:00
Mitchell Stokes
f6a034a481 CMake fix so MSVC works again. Fix suggested by Tamito Kajiyama. 2011-01-02 10:21:03 +00:00
Campbell Barton
6fdfa97edb CMake: use blender_include_dirs("${OPENGL_INCLUDE_DIR}") rather then blender_include_dirs(${OPENGL_INCLUDE_DIR}) 
Apparently this is needed for MSVC in some cases, reported by Tamito Kajiyama r33895.
 2010-12-31 04:29:11 +00:00
Nathan Letwory
71eb4a2312 Work around cmake error on Windows. 2010-12-27 09:33:32 +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
0d9ead00f8 fix for cmake flag detection, was not caching the resulting variable so the test ran each time. 
also cache SSE, SSE2 checks.
 2010-12-21 03:32:51 +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
ed4e7271f1 CMake now tests warnings are supported, GCC 4.0 wasn't working because of unsupported warnings. 
this can work for other compilers too, currently intel and gcc use this.
 2010-12-16 09:55:35 +00:00
Campbell Barton
35fa581403 BKE_assert(), only prints the error unless cmake define WITH_ASSERT_ABORT is enabled and it will call abort(). 
made this option advanced so people don't enable along with other features.
 2010-12-15 10:22:26 +00:00
Campbell Barton
1622385445 pedantic word ordering change. 
- wm.add_modal_handler -> modal_handler_add
- wm.add_fileselect -> fileselect_add
- ob.add_shape_key -> shape_key_add
- VIEW3D_OT_add_background_image -> VIEW3D_OT_background_image_add (same for remove)

Also made 2 internal cmake vars hidden.
 2010-12-08 11:42:11 +00:00
Campbell Barton
cea760ac5a this change broke building. 2010-12-08 09:50:49 +00:00
Campbell Barton
eb26103822 cmake - mark vars as advanced so they dont show up by default when configuring. 2010-12-08 09:02:08 +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
Campbell Barton
263830f000 Enabled GCC -Wwrite-strings warning for CMake and replaced many 'char's for 'const char's,. 
Only one functional change where Transform orientations passed "" to BIF_createTransformOrientation() which could then have the value written into.
 2010-12-03 17:05:21 +00:00
Campbell Barton
cd97253502 - added GCC warning -Wstrict-prototypes 
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
 2010-12-03 12:30:59 +00:00
Campbell Barton
3e173f4d21 disable redcode support for cmake & scons-freebsd 2010-12-01 07:25:59 +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
Nathan Letwory
a5cecd8284 Remove library specification. 2010-11-24 09:13:59 +00:00
Campbell Barton
5a37554b1e disallow disabling WITH_SAMPLERATE if any audio outputs are enabled. 2010-11-21 16:32:11 +00:00
Campbell Barton
c85c2746df WITH_SAMPLERATE option for cmake, without this playback wont behave right so this is mainly intended for developers who build without audio enabled. 2010-11-21 14:32:55 +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
cd2ab75b73 - include pthreads for win32 globally (as with opengl). 
- MSVC CFLAGS were being set by only checking WIN32, (breaking non-msvc win32 builds)
 2010-11-21 09:10:50 +00:00
Campbell Barton
a04bbb2374 use CMake's OpenMP built in detection rather then defining flags ourselves. 2010-11-19 11:33:12 +00:00
Campbell Barton
8fee983619 patch from Dan Eicher to support intel C++ compiler for CMake on *nix. 2010-11-15 05:32:49 +00:00
Andrea Weikert
dcda17b3b3 == filebrowser == 
Bringing back missing feature: Create new directory by typing a not existing name into the directory button.

Note: Small issue still with autocomplete -> if typing the new directory directly after autocomplete, it doesn't execute the operator yet.

Also fixed some minor compile/cleanup issues with warning about signed/unsigned comparison and missing header.
 2010-11-06 16:09:12 +00:00
Campbell Barton
66b274766a minor c90 compat edits. (no functional changes). 2010-11-05 13:37:18 +00:00
Sergey Sharybin
228ed6f086 Global definition of _LARGEFILE_SOURCE, _FILE_OFFSET_BITS and _LARGEFILE64_SOURCE at linux and win32/mingw platforms 
Needed to work properly with large files at 32bit system (display correct size in file browser, i.e.)

This will also fix compilation with zlib 1.2.5
 2010-11-04 17:02:25 +00:00
Campbell Barton
dba1904f65 bugfix [#24518] Blender wont compile with -Wall -Werror and COLLADA support 
fix included in report from Martijn Berger (mberger)
made some small changes.

- use ints rather then unsigned long for printing, values are not likely to be very large.
- CMake remove strict flags from collada build dir since I had warnings in the collada headers.
- added xml2 to collada libraries else I couldnt get collada building.
 2010-11-03 22:44:39 +00:00
Campbell Barton
6b677a2616 own recent commit broke this python import: 
from mathutils.geometry import PolyFill

I couldn't find a way for python's inittab to do this so just inserting mathutils.geometry into sys.modules manually.
 2010-10-31 13:17:39 +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
c4ad3cb5c4 Same warning suppression as with SCons 2010-10-21 07:48:51 +00:00
Nathan Letwory
db74070778 Make C4013 throw a warning 
-> 'function' undefined; assuming extern returning int
 2010-10-19 05:42:31 +00:00
Campbell Barton
799fc68234 cflags, cxxflags & linkflags in buildinfo. 2010-10-18 12:56:14 +00:00
Campbell Barton
6d0d688943 define NDEBUG for release builds so assert() is disabled. 2010-10-18 12:35:40 +00:00
Campbell Barton
58683fa993 enable DEBUG define in CMake and scons, also change booleans debug option to BOP_DEBUG, which was used inconsistently, and had to add a define for superlu. 2010-10-18 11:21:22 +00:00
Campbell Barton
c7c128f03b remove LCMS option from cmake, this is only testing code. developers who want to work on it can uncomment. 2010-10-17 23:32:48 +00:00