Merge pull request #1806 from fape/marmalade_third_party_cleanup

fixed #1629: Marmalade third party cleanup.

cocos2dx/platform/third_party/marmalade/libjpeg.mkf

@@ -1,79 +0,0 @@
-includepath
-{
-	.
-	"jpeg-6b"
-}
-
-files
-{
-	[libjpeg]
-	("jpeg-6b")
-	jconfig.h
-    cderror.h
-    cdjpeg.c
-    cdjpeg.h
-    jcapimin.c
-    jccoefct.c
-    jccolor.c
-    jcdctmgr.c
-    jchuff.c
-    jchuff.h
-    jcmarker.c
-    jcomapi.c
-    jcparam.c
-    jcphuff.c
-    jcprepct.c
-    jcsample.c
-    jdapimin.c
-    jdapistd.c
-    jdatadst.c
-    jdatasrc.c
-    jdcoefct.c
-    jdcolor.c
-    jdct.h
-    jddctmgr.c
-    jdhuff.c
-    jdhuff.h
-    jdinput.c
-    jdmarker.c
-    jdmaster.c
-    <gccnowarn>
-    jdmainct.c
-    </gccnowarn>
-    jdmerge.c
-    jdphuff.c
-    jdpostct.c
-    jdsample.c
-    jdtrans.c
-    jerror.c
-    jerror.h
-    jfdctflt.c
-    jfdctfst.c
-    jfdctint.c
-    jidctflt.c
-    jidctfst.c
-    jidctint.c
-    jidctred.c
-    jinclude.h
-    #jmemansi.c
-    jmemmgr.c
-    #jmemname.c
-    jmemnobs.c
-    jmemsys.h
-    jmorecfg.h
-    jpegint.h
-    jpeglib.h
-    jquant1.c
-    jquant2.c
-    jutils.c
-    jversion.h
-    rdbmp.c
-    rdcolmap.c
-    rdgif.c
-    rdppm.c
-    rdrle.c
-    rdswitch.c
-    rdtarga.c
-    transupp.c
-    transupp.h
-} 

cocos2dx/platform/third_party/marmalade/libpng.mkf

@@ -1,33 +0,0 @@
-
-includepath
-{
-	.
-	"libpng"
-}
-
-subproject zlib
-
-files
-{
-	[libpng]
-	("libpng")
-	png.h
-	pngconf.h
-	png.c
-	pngerror.c
-	pnggccrd.c
-	pngget.c
-	pngmem.c
-	pngpread.c
-	pngread.c
-	pngrio.c
-	pngrtran.c
-	pngrutil.c
-	pngset.c
-	pngtrans.c
-	pngvcrd.c
-	pngwio.c
-	pngwrite.c
-	pngwtran.c
-	pngwutil.c
-}

cocos2dx/platform/third_party/marmalade/libtiff.mkf

@@ -1,9 +1,12 @@
-includepath headers
+includepath 
+{
+	libtiff/headers
+}
 
 files
 {
-	[Source]
-	(source)
+	[source]
+	(libtiff/source)
 	tif_aux.c
     tif_close.c
     tif_codec.c
@@ -42,8 +45,8 @@ files
     tif_write.c
     tif_zip.c
 
-	[Headers]
-	(headers)
+	[headers]
+	(libtiff/headers)
     t4.h
     tiff.h
     tiffconf.h

cocos2dx/platform/third_party/marmalade/libxml2.mkf

@@ -53,15 +53,6 @@ undefines
 
 files
 {
-	(libxml2/sources)
-	elfgcchack.h
-	libxml.h
-	trio.h
-	triodef.h
-	trionan.h
-	triop.h
-	triostr.h
-
 	(libxml2/include/libxml)
 	["common/libxml"]
 	c14n.h
@@ -122,6 +113,14 @@ files
 	
 	(libxml2/sources)
 	["sources"]
+	elfgcchack.h
+	libxml.h
+	trio.h
+	triodef.h
+	trionan.h
+	triop.h
+	triostr.h
+	
 	c14n.c
 	catalog.c
 	chvalid.c

cocos2dx/platform/third_party/marmalade/zlib.mkf

@@ -1,35 +0,0 @@
-includepath
-{
-	.
-	"zlib"
-}
-
-files
-{ 
-	[zlib]
-	("zlib")
-	adler32.c
-	compress.c
-	crc32.c
-	crc32.h
-	deflate.c
-	deflate.h
-	gzio.c
-	infback.c
-	inffast.c
-	inffast.h
-	inffixed.h
-	inflate.c
-	inflate.h
-	inftrees.c
-	inftrees.h
-	trees.c
-	trees.h
-	uncompr.c
-	zconf.h
-	zconf.in.h
-	zlib.h
-	zutil.c
-	zutil.h
-
-}