svn merge ^/trunk/blender -r41226:41227 .
[blender.git] / source / blender / blenlib / CMakeLists.txt
index a7f124357de11f2173dde3c4e41cd1eab804d80d..2f6b6f7cb26bad30f338c9243175c05ec15a301f 100644 (file)
@@ -1,4 +1,3 @@
-# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
 
 set(INC 
        .
-       ../makesdna
        ../blenkernel
        ../blenloader
        ../gpu
+       ../makesdna
        ../../../intern/ghost
        ../../../intern/guardedalloc
 )
@@ -53,6 +52,7 @@ set(SRC
        intern/DLRB_tree.c
        intern/boxpack2d.c
        intern/bpath.c
+       intern/callbacks.c
        intern/cpu.c
        intern/dynlib.c
        intern/edgehash.c
@@ -78,8 +78,10 @@ set(SRC
        intern/rand.c
        intern/rct.c
        intern/scanfill.c
+       intern/smallhash.c
        intern/storage.c
        intern/string.c
+       intern/string_utf8.c
        intern/threads.c
        intern/time.c
        intern/uvproject.c
@@ -94,6 +96,7 @@ set(SRC
        BLI_blenlib.h
        BLI_boxpack2d.h
        BLI_bpath.h
+       BLI_callbacks.h
        BLI_cpu.h
        BLI_dlrbTree.h
        BLI_dynlib.h
@@ -101,6 +104,7 @@ set(SRC
        BLI_edgehash.h
        BLI_editVert.h
        BLI_fileops.h
+       BLI_fileops_types.h
        BLI_fnmatch.h
        BLI_ghash.h
        BLI_graph.h
@@ -127,9 +131,8 @@ set(SRC
        BLI_rand.h
        BLI_rect.h
        BLI_scanfill.h
-       BLI_storage.h
-       BLI_storage_types.h
        BLI_string.h
+       BLI_string_utf8.h
        BLI_threads.h
        BLI_utildefines.h
        BLI_uvproject.h
@@ -137,12 +140,13 @@ set(SRC
        BLI_voxel.h
        BLI_winstuff.h
        PIL_time.h
-       intern/BLI_callbacks.h
        intern/dynamiclist.h
 )
 
 if(WITH_BINRELOC)
-       list(APPEND INC_SYS "${BINRELOC_INCLUDE_DIRS}")
+       list(APPEND INC_SYS
+               ${BINRELOC_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_BINRELOC)
 endif()