diff options
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 7b1b979b777..58f7f55ef74 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -611,6 +611,7 @@ typedef struct Scene { /* yafray: renderer flag (not only exclusive to yafray) */ #define R_INTERN 0 #define R_YAFRAY 1 +#define R_FREESTYLE 2 /* scemode (int now) */ #define R_DOSEQ 0x0001 diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index a85f561da92..d4b222f3644 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC makesdna.c ../../../../intern/guardedalloc/intern/mallocn.c ../../../../intern/guardedalloc/intern/mmap_win.c) +SET(SRC makesdna.c ../../../../intern/guardedalloc/intern/mallocn.c) INCLUDE_DIRECTORIES(../../../../intern/guardedalloc ..) diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index acba9ae2d1d..872fd515f1d 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -8,7 +8,6 @@ defines = [] root_build_dir=env['BF_BUILDDIR'] source_files = ['makesdna.c'] -header_files = env.Glob('../*.h') makesdna_tool = env.Copy() dna = env.Copy() @@ -36,7 +35,6 @@ else: dna_dict = dna.Dictionary() dna.Depends ('dna.c', makesdna) -dna.Depends ('dna.c', header_files) if env['OURPLATFORM'] != 'linuxcross': dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET") else: |