warning fixes and minor cmake changes.

12 files changed, 42 insertions, 22 deletions

diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt
index 99923bc99dc..91500712a4c 100644
--- a/intern/boolop/CMakeLists.txt
+++ b/intern/boolop/CMakeLists.txt
@@ -24,9 +24,18 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC . intern extern ../moto/include ../container ../memutil ../../source/blender/makesdna ../guardedalloc ../../source/blender/blenlib)
+SET(INC	
+	.
+	./intern
+	./extern
+	../memutil
+	../container
+	../guardedalloc
+	../moto/include
+	../../source/blender/blenlib
+	../../source/blender/makesdna
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_bop "${SRC}" "${INC}")
-#, libtype='common', priority=5 )
diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt
index 4f87e161030..debbc86c240 100644
--- a/intern/bsp/CMakeLists.txt
+++ b/intern/bsp/CMakeLists.txt
@@ -24,9 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC intern ../container ../moto/include ../memutil)
+SET(INC
+	./intern
+	../container
+	../moto/include
+	../memutil
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}")
-#, libtype='core', priority=15 )
diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt
index 462b62ae8bb..9ae684ec542 100644
--- a/intern/container/CMakeLists.txt
+++ b/intern/container/CMakeLists.txt
@@ -29,4 +29,3 @@ SET(INC .)
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}")
-#, libtype=['intern'], priority = 10 )
diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt
index 7fdf08978a4..77ab6249e7f 100644
--- a/intern/decimation/CMakeLists.txt
+++ b/intern/decimation/CMakeLists.txt
@@ -24,9 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC . ../moto/include ../container ../memutil)
+SET(INC
+	.
+	../container
+	../memutil
+	../moto/include
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}")
-#, libtype=['core','common','player'], priority = [10, 20, 25] )
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt
index d0e100907b1..57fb6180adb 100644
--- a/intern/elbeem/CMakeLists.txt
+++ b/intern/elbeem/CMakeLists.txt
@@ -38,4 +38,3 @@ IF(WITH_OPENMP)
 ENDIF(WITH_OPENMP)
 
 BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}")
-#, libtype='blender', priority=0 )
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index 642b04fdb60..29e4f553974 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -26,12 +26,18 @@
 
 SET(INC .)
 
-FILE(GLOB SRC intern/*.c)
+SET(SRC
+	./intern/mallocn.c
+)
+
+IF(WIN32)
+	LIST(APPEND SRC ./intern/mmap_win.c)
+ENDIF(WIN32)
 
 BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}")
 
-# Override C++ alloc optional
+# Override C++ alloc, optional.
 IF(WITH_CXX_GUARDEDALLOC)
-	FILE(GLOB SRC cpp/*.cpp)
+	SET(SRC cpp/mallocn.cpp)
 	BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
 ENDIF(WITH_CXX_GUARDEDALLOC)
diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt
index 8ea05ac994d..50ae78d6d16 100644
--- a/intern/iksolver/CMakeLists.txt
+++ b/intern/iksolver/CMakeLists.txt
@@ -24,9 +24,12 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC intern ../moto/include ../memutil)
+SET(INC
+	intern
+	../memutil
+	../moto/include
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_ik "${SRC}" "${INC}")
-#, libtype=['blender'], priority = [10] )
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
index 39443bd2b22..88f902b38c8 100644
--- a/intern/itasc/CMakeLists.txt
+++ b/intern/itasc/CMakeLists.txt
@@ -29,4 +29,3 @@ SET(INC ../../extern/Eigen2)
 FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp)
 
 BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}")
-#, libtype=['blender'], priority = [10] )
diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt
index 3dc725acb50..ebbc53403f4 100644
--- a/intern/memutil/CMakeLists.txt
+++ b/intern/memutil/CMakeLists.txt
@@ -26,7 +26,9 @@
 
 SET(INC . ..)
 
-FILE(GLOB SRC intern/*.cpp)
+SET(SRC
+	./intern/MEM_CacheLimiterC-Api.cpp
+	./intern/MEM_RefCountedC-Api.cpp
+)
 
 BLENDERLIB(bf_intern_memutil "${SRC}" "${INC}")
-#, libtype=['intern', 'player'], priority = [0, 180] )
diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt
index 3d6d3d1a783..91c523eced9 100644
--- a/intern/moto/CMakeLists.txt
+++ b/intern/moto/CMakeLists.txt
@@ -29,4 +29,3 @@ SET(INC include)
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_moto "${SRC}" "${INC}")
-#, libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )
diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt
index 0551c94e586..b29eaa680b6 100644
--- a/intern/opennl/CMakeLists.txt
+++ b/intern/opennl/CMakeLists.txt
@@ -29,5 +29,3 @@ SET(INC extern superlu)
 FILE(GLOB SRC intern/*.c superlu/*.c)
 
 BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}")
-#, libtype='core', priority=55 )
-
diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt
index 7aeace4ca83..a1b130d93be 100644
--- a/intern/string/CMakeLists.txt
+++ b/intern/string/CMakeLists.txt
@@ -25,8 +25,6 @@
 # ***** END GPL LICENSE BLOCK *****
 
 SET(INC .)
-
-FILE(GLOB SRC intern/*.cpp)
+SET(SRC ./intern/STR_String.cpp)
 
 BLENDERLIB(bf_intern_string "${SRC}" "${INC}")
-#, libtype=['core', 'player'], priority = [30,10] )