griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,703 Commits 1 Branch 0 Tags
40e3dfd3bd1ff22d293df1d9d7b1b9b90d9bd708
Commit Graph

609 Commits

Author SHA1 Message Date
Tamito Kajiyama
3b012c041f Merged changes in the trunk up to revision 49090. 2012-07-20 23:12:05 +00:00
Campbell Barton
5b04685f49 handy cmake list macros for inserting items into a list before/after existing items 2012-07-16 08:26:42 +00:00
Campbell Barton
aeaa95a525 more minor speedups for new mask rasterizer 2012-07-14 04:07:59 +00:00
Tamito Kajiyama
b7b5029814 Merged changes in the trunk up to revision 48695. 2012-07-06 23:46:48 +00:00
Antony Riakiotakis
fa92f2fb55 Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW. 2012-07-05 11:39:11 +00:00
Tamito Kajiyama
98a7ca61fa Merged changes in the trunk up to revision 48505. 2012-07-03 00:02:45 +00:00
Thomas Dinges
273f56ace0 Scons: 
* WITH_BF_COMPOSITOR option, to disable tile compositor compilation.
* Removed unused SCons file.
 2012-06-30 22:44:36 +00:00
Thomas Dinges
91de70a788 Cycles / Boost: 
* Windows (msvc 2008) is now using Boost 1.49
 2012-06-30 18:20:14 +00:00
Campbell Barton
c8c743b609 code cleanup: compile with clang and quiet some warnings. 2012-06-28 12:32:06 +00:00
Tamito Kajiyama
1f7ae143a2 Merged changes in the trunk up to revision 48227. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c
 2012-06-24 10:29:26 +00:00
Campbell Barton
0c8ebad16e add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed. 2012-06-23 14:23:44 +00:00
Campbell Barton
263be14811 rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate. 2012-06-23 13:42:14 +00:00
Antony Riakiotakis
84c0aee254 Correct openjpeg for scons too. 2012-06-21 14:49:10 +00:00
Tamito Kajiyama
8135cc9f95 Merged changes in the trunk up to revision 47700. 
Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h
 2012-06-10 20:50:43 +00:00
Sergey Sharybin
491babf2a7 Enable cuda sm_30 kernels for buildbot 2012-06-05 19:23:52 +00:00
Tamito Kajiyama
329b05dcd7 Merged changes in the trunk up to revision 47381. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
 2012-06-03 21:11:10 +00:00
Thomas Dinges
b1e8063d69 Cycles / CUDA: 
* Windows department switches to CUDA Toolkit 4.2 :)
* Windows Buildbot uses that too now (thanks jesterKing) 
* Re-enable sm_13 for x86, compiled again with current SVN and the new toolkit. 

* All official builds for windows now come with sm_13, sm_20, sm_21 and sm_30 for the Kepler cards.
 2012-05-29 12:28:34 +00:00
Thomas Dinges
04c30c5efb Scons / MSVC - Windows x64 
* SSE/SSE2 is an unknown option for the compiler (Command line warning D9002 : ignoring unknown option '/arch:SSE2'), so it can be left out because on x64 it automatically builds with SSE and SSE2.
 2012-05-28 09:20:04 +00:00
Campbell Barton
1e45042396 code cleanup: remove mode comments, these were applied very un-evenly across a few files. 2012-05-27 13:22:43 +00:00
Campbell Barton
9978f97b12 cmake edits 
- only show mingw option when building with mingw
- always run cmake configure with convenience build targets so failed configurations stop re-configuring.
- disable WITH_GHOST_XDND in 'make lite'
 2012-05-27 10:03:13 +00:00
Tamito Kajiyama
b6a9a953bc Merged changes in the trunk up to revision 47056. 
Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c
 2012-05-26 22:22:45 +00:00
Joshua Leung
795edb74fa scons - Added option to not remove and unpack python modules bundle every 
compile
 2012-05-23 03:49:42 +00:00
Antony Riakiotakis
1937f3b8de Disable building of CUDA 1.3 kernels for cycles for win32 cmake and mingw32 scons. They were already disabled for scons MSVC 32bit. 2012-05-22 12:30:37 +00:00
Tamito Kajiyama
a5152b7ca0 Merged changes in the trunk up to revision 46787. 
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
 2012-05-19 08:40:56 +00:00
Dan Eicher
e6ddad5146 CPack rpm cleanup 
-- package name and .spec->Version match
-- use find_lang macro for locales
-- Requires & Provides (mostly) match the fedora .spec
-- fix unpackaged file error for blender-thumbnailer.py 

TODO: figure out how persuade CPack to make multiple rpms to also package blenderplayer
 2012-05-16 02:51:58 +00:00
Daniel Genrich
7f92b5f79a Fix El Topo: 
- Library compile errors
- 2 Bugs (have been reported to lib owner)
- LAPACK for cmake

TODO:
- Scons is still missing LAPACK lib define
- Do other platforms got LAPACK lib?
 2012-05-15 11:35:01 +00:00
Antony Riakiotakis
232980eef0 Cleanup optimization compile flags for mingw-w64. 
After testing it seems that for safe debug sessions, debug build optimizations need to be off. 

Also removed sse flags from release flags since they are included in ray optimization flags which are on by default.
 2012-05-14 23:36:07 +00:00
Antony Riakiotakis
e5963aae1d Change the scons configuration for MinGW-w64 to be more in-line with cmake. Also deactivate openmp as it causes crashes when rendering with subsurf or multires modifiers 2012-05-13 17:26:07 +00:00
Nathan Letwory
a88f910b9a Disable sm_13 CUDA kernel building for now, as the build fails with out of memory. 2012-05-12 22:00:32 +00:00
Nathan Letwory
63690b6b45 Enable setting of CUDA kernels to compile on command-line: 
python scons/scons.py BF_CYCLES_CUDA_BINARIES_ARCH=sm_20,sm21
 2012-05-12 21:37:01 +00:00
Tamito Kajiyama
8925ed1420 Merged changes in the trunk up to revision 46557. 
Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c

Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().
 2012-05-11 22:48:41 +00:00
Nathan Letwory
e8e1a7cb9e Enable OpenCOLLADA support for MingW64 builds by default. 
Note: don't forget to update your local checkout of lib/mingw64
 2012-05-11 17:29:55 +00:00
Antony Riakiotakis
f91fa9d2ce Enable ffmpeg building with MinGW-w64. The libraries were compiled with gcc 4.7, however is has been claimed there are issues with gcc > 4.4 so this is for testing purposes. Still it doesn't crash on startup anymore. Forgot to mention on ffmpeg lib commit that committed ffmpeg version is 0.10.2 2012-05-10 11:37:41 +00:00
Tamito Kajiyama
bb1f8d9586 Merged changes in the trunk up to revision 46309. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
 2012-05-05 11:40:42 +00:00
Brecht Van Lommel
ad929044d3 Fix: recent commit setting python3.2 command should not be applied to this file 
scons build scripts are still using python2.
 2012-05-02 09:03:04 +00:00
Campbell Barton
c6051ea87b replace python3 command with python3.2, python3 isnt available on ubuntu. 2012-05-01 20:45:16 +00:00
Thomas Dinges
e08a46c070 Windows / Scons: 
* Disable CUDA kernel compile per default, so people who don't use it can compile file with the default config.
 2012-04-30 09:06:19 +00:00
Tamito Kajiyama
2585d52405 Merged changes in the trunk up to revision 46045. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
 2012-04-29 00:59:04 +00:00
Nathan Letwory
fd2439f47a bump commit count, mingw32 -> mingw64 2012-04-28 08:47:37 +00:00
Nathan Letwory
5d70a6aedf Add MingW as "platform" 2012-04-28 08:45:55 +00:00
Nathan Letwory
09dc600839 Same mingw fix as for compile 2012-04-28 06:28:07 +00:00
Nathan Letwory
a299855e34 Changes to get mingw buildslaves going. 2012-04-27 13:18:55 +00:00
Antony Riakiotakis
7ac4bd9105 Enable building of the installer with MinGW-w64, patch by Caleb Joseph (Dobz) thanks a lot! 2012-04-25 11:15:55 +00:00
Antony Riakiotakis
75addcf233 Lower optimization settings for MinGW-w64. Full optimization causes artifacts with empties and gods know what else. Turned on -ftree-vectorize to match MSVC behaviour for 64bit. 2012-04-24 17:20:51 +00:00
Antony Riakiotakis
4e6590067d revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too 2012-04-24 16:14:23 +00:00
Antony Riakiotakis
0db3c5f743 Remove mingw-w64 errors from loss of precision by converting 64bit pointers to ints. All cases found were harmless and the error behaviour could be turned off by the -fpermissive flag but I'd rather keep that off to detect any real problems should they arise. 2012-04-24 14:33:44 +00:00
Antony Riakiotakis
4782522379 Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications. 
Thanks!
 2012-04-24 12:57:58 +00:00
Antony Riakiotakis
c498c0eb42 Update build files to use the new lib locations for MinGW. For builders: you will need to checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/mingw32/ 
to build with MinGW past this commit.
 2012-04-23 01:11:42 +00:00
Antony Riakiotakis
ff06260ea1 Solve restriction of MinGW that users have to turn ffmpeg on for cmake. 2012-04-22 14:33:40 +00:00
Tamito Kajiyama
cdbfd1db38 Merged changes in the trunk up to revision 45820. 
Conflicts resolved:
source/creator/creator.c
 2012-04-21 00:33:36 +00:00