diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-13 23:27:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-13 23:27:42 +0400 |
| commit | 609933208dba8ac78dff85294d83d495a8ae45d4 (patch) | |
| tree | 78f4c0b25daa7ba6be85bd78b7b246526c06cd1b /source/blender/editors | |
| parent | 6551d4a2657696f37a79f96d58e5eb05d6422d5f (diff) | |
dont include the preview.blend in headless mode
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/editors/render/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 080673d6e54..17e3a868a8c 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -37,13 +37,16 @@ if(WITH_BLENDER) # blender only list(APPEND SRC startup.blend.c - preview.blend.c bmonofont.ttf.c ) if(NOT WITH_HEADLESS) # blender UI only list(APPEND SRC + # blends + preview.blend.c + + # images splash.png.c blenderbuttons.c diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 0d1de00806b..7e497200710 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -60,4 +60,8 @@ if(WITH_OPENMP) add_definitions(-DPARALLEL=1) endif() +if(WITH_HEADLESS) + add_definitions(-DWITH_HEADLESS) +endif() + blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 2404805c17b..007ae96ae59 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -171,6 +171,7 @@ static Main *pr_main= NULL; void ED_preview_init_dbase(void) { +#ifndef WITH_HEADLESS BlendFileData *bfd; extern int datatoc_preview_blend_size; extern char datatoc_preview_blend[]; @@ -184,6 +185,7 @@ void ED_preview_init_dbase(void) MEM_freeN(bfd); } G.fileflags= fileflags; +#endif } void ED_preview_free_dbase(void) |