diff --git a/Extras/Serialize/CMakeLists.txt b/Extras/Serialize/CMakeLists.txt
index 68b1d1925..bc7ddde17 100644
--- a/Extras/Serialize/CMakeLists.txt
+++ b/Extras/Serialize/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 IF (BUILD_BLEND_DEMO OR INTERNAL_UPDATE_SERIALIZATION_STRUCTURES)
-	SUBDIRS(BlenderSerialize )
+	#SUBDIRS(BlenderSerialize )
 ENDIF()
 
 
diff --git a/Extras/Serialize/HeaderGenerator/CMakeLists.txt b/Extras/Serialize/HeaderGenerator/CMakeLists.txt
index 4739fcbdf..3c1e862c8 100644
--- a/Extras/Serialize/HeaderGenerator/CMakeLists.txt
+++ b/Extras/Serialize/HeaderGenerator/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(includes
 
 
 LINK_LIBRARIES(
-	 BulletFileLoader BlenderSerialize LinearMath
+	 BulletFileLoader  LinearMath
 )
 
 INCLUDE_DIRECTORIES(${includes})
diff --git a/Extras/Serialize/makesdna/makesdna.cpp b/Extras/Serialize/makesdna/makesdna.cpp
index 77deaa63e..72795506e 100644
--- a/Extras/Serialize/makesdna/makesdna.cpp
+++ b/Extras/Serialize/makesdna/makesdna.cpp
@@ -86,10 +86,12 @@ typedef unsigned __int64 uint64_t;
 
 	/* Linux-i386, Linux-Alpha, Linux-ppc */
 #include <stdint.h>
+typedef intptr_t btintptr_t;
 
 #elif defined (__APPLE__)
 
 #include <inttypes.h>
+typedef intptr_t btintptr_t;
 
 #elif defined(FREE_WINDOWS)
 
diff --git a/data/wood.jpg b/data/wood.jpg
new file mode 100644
index 000000000..fab97ab13
Binary files /dev/null and b/data/wood.jpg differ