merge with/from trunk at r35190

1 files changed, 31 insertions, 15 deletions

diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 733c81676d1..3e611ab406e 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -19,33 +19,49 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-FILE(GLOB SRC *.c)
-
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
+	../../blenloader
 	../../blenlib
 	../../bmesh
 	../../gpu
 	../../imbuf
-	../../../../intern/guardedalloc
-	../../../../intern/smoke/extern
 	../../makesdna
 	../../makesrna
-	../../render/extern/include
 	../../windowmanager
+	../../render/extern/include
+	../../../../intern/guardedalloc
+	../../../../intern/smoke/extern
 )
 
-IF(WITH_GAMEENGINE)
-	SET(INC ${INC} ../../../kernel/gen_system)
-	ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
+set(SRC
+	drawanimviz.c
+	drawarmature.c
+	drawmesh.c
+	drawobject.c
+	drawvolume.c
+	space_view3d.c
+	view3d_buttons.c
+	view3d_draw.c
+	view3d_edit.c
+	view3d_fly.c
+	view3d_header.c
+	view3d_ops.c
+	view3d_select.c
+	view3d_snap.c
+	view3d_toolbar.c
+	view3d_view.c
+
+	view3d_intern.h
+)
 
-IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
+if(WITH_GAMEENGINE)
+	list(APPEND INC ../../../kernel/gen_system)
+	add_definitions(-DWITH_GAMEENGINE)
+endif()
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
+add_definitions(-DGLEW_STATIC)
 
-BLENDERLIB(bf_editor_space_view3d "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}")