merge from trunk r37405

1 files changed, 45 insertions, 33 deletions

diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index b0c74ca12fc..feac4301c4a 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -23,44 +23,56 @@ set(INC
 	../../blenlib
 	../../../../intern/guardedalloc
 )
+
+set(INC_SYS
+
+)
+
 set(SRC
 	Bfont.c
-	add.png.c
 	bfont.ttf.c
-	blenderbuttons.c
-	blob.png.c
-	blur.png.c
 	bmonofont.ttf.c
 	bunifont.ttf.c
-	clay.png.c
-	clone.png.c
-	crease.png.c
-	darken.png.c
-	draw.png.c
-	fill.png.c
-	flatten.png.c
-	grab.png.c
-	inflate.png.c
-	layer.png.c
-	lighten.png.c
-	mix.png.c
-	multiply.png.c
-	nudge.png.c
-	pinch.png.c
-	preview.blend.c
-	prvicons.c
-	scrape.png.c
-	smear.png.c
-	smooth.png.c
-	snake_hook.png.c
-	soften.png.c
-	splash.png.c
 	startup.blend.c
-	subtract.png.c
-	texdraw.png.c
-	thumb.png.c
-	twist.png.c
-	vertexdraw.png.c
+	preview.blend.c
 )
 
-blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}")
+if(NOT WITH_HEADLESS)
+	list(APPEND SRC
+		splash.png.c
+		blenderbuttons.c
+
+		# brushes
+		add.png.c
+		blob.png.c
+		blur.png.c
+		clay.png.c
+		clone.png.c
+		crease.png.c
+		darken.png.c
+		draw.png.c
+		fill.png.c
+		flatten.png.c
+		grab.png.c
+		inflate.png.c
+		layer.png.c
+		lighten.png.c
+		mix.png.c
+		multiply.png.c
+		nudge.png.c
+		pinch.png.c
+		prvicons.c
+		scrape.png.c
+		smear.png.c
+		smooth.png.c
+		snake_hook.png.c
+		soften.png.c
+		subtract.png.c
+		texdraw.png.c
+		thumb.png.c
+		twist.png.c
+		vertexdraw.png.c
+	)
+endif()
+
+blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}" "${INC_SYS}")