Revision: 8341
http://playerstage.svn.sourceforge.net/playerstage/?rev=8341&view=rev
Author: natepak
Date: 2009-10-30 14:33:58 +0000 (Fri, 30 Oct 2009)
Log Message:
-----------
Removed zlib from assimp
Modified Paths:
--------------
code/gazebo/trunk/3rd_party/assimp/code/CMakeLists.txt
code/gazebo/trunk/3rd_party/assimp/code/XFileParser.cpp
Removed Paths:
-------------
code/gazebo/trunk/3rd_party/assimp/contrib/zlib/
code/gazebo/trunk/3rd_party/assimp/lib/
Modified: code/gazebo/trunk/3rd_party/assimp/code/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/3rd_party/assimp/code/CMakeLists.txt 2009-10-30
13:59:28 UTC (rev 8340)
+++ code/gazebo/trunk/3rd_party/assimp/code/CMakeLists.txt 2009-10-30
14:33:58 UTC (rev 8341)
@@ -311,28 +311,28 @@
../contrib/ConvertUTF/ConvertUTF.c
)
-SOURCE_GROUP( zlib FILES
- ../contrib/zlib/adler32.c
- ../contrib/zlib/compress.c
- ../contrib/zlib/crc32.c
- ../contrib/zlib/crc32.h
- ../contrib/zlib/deflate.c
- ../contrib/zlib/deflate.h
- ../contrib/zlib/inffast.c
- ../contrib/zlib/inffast.h
- ../contrib/zlib/inffixed.h
- ../contrib/zlib/inflate.c
- ../contrib/zlib/inflate.h
- ../contrib/zlib/inftrees.c
- ../contrib/zlib/inftrees.h
- ../contrib/zlib/trees.c
- ../contrib/zlib/trees.h
- ../contrib/zlib/zconf.h
- ../contrib/zlib/zconf.in.h
- ../contrib/zlib/zlib.h
- ../contrib/zlib/zutil.c
- ../contrib/zlib/zutil.h
-)
+#SOURCE_GROUP( zlib FILES
+# ../contrib/zlib/adler32.c
+# ../contrib/zlib/compress.c
+# ../contrib/zlib/crc32.c
+# ../contrib/zlib/crc32.h
+# ../contrib/zlib/deflate.c
+# ../contrib/zlib/deflate.h
+# ../contrib/zlib/inffast.c
+# ../contrib/zlib/inffast.h
+# ../contrib/zlib/inffixed.h
+# ../contrib/zlib/inflate.c
+# ../contrib/zlib/inflate.h
+# ../contrib/zlib/inftrees.c
+# ../contrib/zlib/inftrees.h
+# ../contrib/zlib/trees.c
+# ../contrib/zlib/trees.h
+# ../contrib/zlib/zconf.h
+# ../contrib/zlib/zconf.in.h
+# ../contrib/zlib/zlib.h
+# ../contrib/zlib/zutil.c
+# ../contrib/zlib/zutil.h
+#)
@@ -564,26 +564,26 @@
../contrib/irrXML/irrTypes.h
../contrib/irrXML/irrXML.cpp
../contrib/irrXML/irrXML.h
- ../contrib/zlib/adler32.c
- ../contrib/zlib/compress.c
- ../contrib/zlib/crc32.c
- ../contrib/zlib/crc32.h
- ../contrib/zlib/deflate.c
- ../contrib/zlib/deflate.h
- ../contrib/zlib/inffast.c
- ../contrib/zlib/inffast.h
- ../contrib/zlib/inffixed.h
- ../contrib/zlib/inflate.c
- ../contrib/zlib/inflate.h
- ../contrib/zlib/inftrees.c
- ../contrib/zlib/inftrees.h
- ../contrib/zlib/trees.c
- ../contrib/zlib/trees.h
- ../contrib/zlib/zconf.h
- ../contrib/zlib/zconf.in.h
- ../contrib/zlib/zlib.h
- ../contrib/zlib/zutil.c
- ../contrib/zlib/zutil.h
+ # ../contrib/zlib/adler32.c
+ # ../contrib/zlib/compress.c
+ # ../contrib/zlib/crc32.c
+ # ../contrib/zlib/crc32.h
+ # ../contrib/zlib/deflate.c
+ # ../contrib/zlib/deflate.h
+ # ../contrib/zlib/inffast.c
+ # ../contrib/zlib/inffast.h
+ # ../contrib/zlib/inffixed.h
+ # ../contrib/zlib/inflate.c
+ # ../contrib/zlib/inflate.h
+ # ../contrib/zlib/inftrees.c
+ # ../contrib/zlib/inftrees.h
+ # ../contrib/zlib/trees.c
+ # ../contrib/zlib/trees.h
+ # ../contrib/zlib/zconf.h
+ # ../contrib/zlib/zconf.in.h
+ # ../contrib/zlib/zlib.h
+ # ../contrib/zlib/zutil.c
+ # ../contrib/zlib/zutil.h
../contrib/ConvertUTF/ConvertUTF.c
)
Modified: code/gazebo/trunk/3rd_party/assimp/code/XFileParser.cpp
===================================================================
--- code/gazebo/trunk/3rd_party/assimp/code/XFileParser.cpp 2009-10-30
13:59:28 UTC (rev 8340)
+++ code/gazebo/trunk/3rd_party/assimp/code/XFileParser.cpp 2009-10-30
14:33:58 UTC (rev 8341)
@@ -53,7 +53,7 @@
#ifndef ASSIMP_BUILD_NO_COMPRESSED_X
-#include "../contrib/zlib/zlib.h"
+#include "zlib.h"
// Magic identifier for MSZIP compressed data
#define MSZIP_MAGIC 0x4B43
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
