From a9d7500ae7af851a2ccfe1174e7307b024b88b87 Mon Sep 17 00:00:00 2001 From: folecr Date: Wed, 25 Jan 2012 18:14:29 -0800 Subject: [PATCH 1/6] Fix whitespace line ending in one single line. --- cocos2dx/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index 4d66db1dd1..6a97c70c6d 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -93,7 +93,7 @@ text_input_node/CCIMEDispatcher.cpp \ text_input_node/CCTextFieldTTF.cpp \ textures/CCTexture2D.cpp \ textures/CCTextureAtlas.cpp \ -textures/CCTextureCache.cpp \ +textures/CCTextureCache.cpp \ textures/CCTexturePVR.cpp \ tileMap_parallax_nodes/CCParallaxNode.cpp \ tileMap_parallax_nodes/CCTMXLayer.cpp \ From e6fddbc0474c7abc02f2570b01c1abceef69ffe9 Mon Sep 17 00:00:00 2001 From: folecr Date: Fri, 27 Jan 2012 10:18:36 -0800 Subject: [PATCH 2/6] Move libraries & include files for third party dependencies so that it is possible to create Android NDK Modules from prebuilt libs. --- .../android/{libjpeg => modules/libjpeg/include}/jconfig.h | 0 .../android/{libjpeg => modules/libjpeg/include}/jconfig_linux.h | 0 .../android/{libjpeg => modules/libjpeg/include}/jconfig_win.h | 0 .../android/{libjpeg => modules/libjpeg/include}/jerror.h | 0 .../android/{libjpeg => modules/libjpeg/include}/jmorecfg.h | 0 .../android/{libjpeg => modules/libjpeg/include}/jpeglib.h | 0 .../libjpeg/libs}/armeabi-v7a/libjpeg.a.REMOVED.git-id | 0 .../libjpeg/libs}/armeabi/libjpeg.a.REMOVED.git-id | 0 .../libjpeg/libs}/x86/libjpeg.a.REMOVED.git-id | 0 .../{libpng => modules/libpng/include}/png.h.REMOVED.git-id | 0 .../android/{libpng => modules/libpng/include}/pngconf.h | 0 .../libpng/libs}/armeabi-v7a/libpng.a.REMOVED.git-id | 0 .../libpng/libs}/armeabi/libpng.a.REMOVED.git-id | 0 .../libpng/libs}/x86/libpng.a.REMOVED.git-id | 0 .../{libxml2/libxml => modules/libxml2/include}/DOCBparser.h | 0 .../{libxml2/libxml => modules/libxml2/include}/HTMLparser.h | 0 .../{libxml2/libxml => modules/libxml2/include}/HTMLtree.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/SAX.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/SAX2.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/c14n.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/catalog.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/chvalid.h | 0 .../{libxml2/libxml => modules/libxml2/include}/debugXML.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/dict.h | 0 .../{libxml2/libxml => modules/libxml2/include}/encoding.h | 0 .../{libxml2/libxml => modules/libxml2/include}/entities.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/globals.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/hash.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/list.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/nanoftp.h | 0 .../{libxml2/libxml => modules/libxml2/include}/nanohttp.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/parser.h | 0 .../{libxml2/libxml => modules/libxml2/include}/parserInternals.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/pattern.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/relaxng.h | 0 .../libxml => modules/libxml2/include}/schemasInternals.h | 0 .../{libxml2/libxml => modules/libxml2/include}/schematron.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/threads.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/tree.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/uri.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/valid.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xinclude.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/xlink.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/xmlIO.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlautomata.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlerror.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlexports.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlmemory.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlmodule.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlreader.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlregexp.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/xmlsave.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlschemas.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlschemastypes.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlstring.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlunicode.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlversion.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xmlwriter.h | 0 .../android/{libxml2/libxml => modules/libxml2/include}/xpath.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xpathInternals.h | 0 .../{libxml2/libxml => modules/libxml2/include}/xpointer.h | 0 .../libxml2/libs}/armeabi-v7a/libxml2.a.REMOVED.git-id | 0 .../libxml2/libs}/armeabi/libxml2.a.REMOVED.git-id | 0 .../libxml2/libs}/x86/libxml2.a.REMOVED.git-id | 0 64 files changed, 0 insertions(+), 0 deletions(-) rename cocos2dx/platform/third_party/android/{libjpeg => modules/libjpeg/include}/jconfig.h (100%) rename cocos2dx/platform/third_party/android/{libjpeg => modules/libjpeg/include}/jconfig_linux.h (100%) rename cocos2dx/platform/third_party/android/{libjpeg => modules/libjpeg/include}/jconfig_win.h (100%) rename cocos2dx/platform/third_party/android/{libjpeg => modules/libjpeg/include}/jerror.h (100%) rename cocos2dx/platform/third_party/android/{libjpeg => modules/libjpeg/include}/jmorecfg.h (100%) rename cocos2dx/platform/third_party/android/{libjpeg => modules/libjpeg/include}/jpeglib.h (100%) rename cocos2dx/platform/third_party/android/{libraries => modules/libjpeg/libs}/armeabi-v7a/libjpeg.a.REMOVED.git-id (100%) rename cocos2dx/platform/third_party/android/{libraries => modules/libjpeg/libs}/armeabi/libjpeg.a.REMOVED.git-id (100%) rename cocos2dx/platform/third_party/android/{libraries => modules/libjpeg/libs}/x86/libjpeg.a.REMOVED.git-id (100%) rename cocos2dx/platform/third_party/android/{libpng => modules/libpng/include}/png.h.REMOVED.git-id (100%) rename cocos2dx/platform/third_party/android/{libpng => modules/libpng/include}/pngconf.h (100%) rename cocos2dx/platform/third_party/android/{libraries => modules/libpng/libs}/armeabi-v7a/libpng.a.REMOVED.git-id (100%) rename cocos2dx/platform/third_party/android/{libraries => modules/libpng/libs}/armeabi/libpng.a.REMOVED.git-id (100%) rename cocos2dx/platform/third_party/android/{libraries => modules/libpng/libs}/x86/libpng.a.REMOVED.git-id (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/DOCBparser.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/HTMLparser.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/HTMLtree.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/SAX.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/SAX2.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/c14n.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/catalog.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/chvalid.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/debugXML.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/dict.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/encoding.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/entities.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/globals.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/hash.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/list.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/nanoftp.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/nanohttp.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/parser.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/parserInternals.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/pattern.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/relaxng.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/schemasInternals.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/schematron.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/threads.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/tree.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/uri.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/valid.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xinclude.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xlink.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlIO.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlautomata.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlerror.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlexports.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlmemory.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlmodule.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlreader.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlregexp.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlsave.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlschemas.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlschemastypes.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlstring.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlunicode.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlversion.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xmlwriter.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xpath.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xpathInternals.h (100%) rename cocos2dx/platform/third_party/android/{libxml2/libxml => modules/libxml2/include}/xpointer.h (100%) rename cocos2dx/platform/third_party/android/{libraries => modules/libxml2/libs}/armeabi-v7a/libxml2.a.REMOVED.git-id (100%) rename cocos2dx/platform/third_party/android/{libraries => modules/libxml2/libs}/armeabi/libxml2.a.REMOVED.git-id (100%) rename cocos2dx/platform/third_party/android/{libraries => modules/libxml2/libs}/x86/libxml2.a.REMOVED.git-id (100%) diff --git a/cocos2dx/platform/third_party/android/libjpeg/jconfig.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jconfig.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jconfig_linux.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig_linux.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jconfig_linux.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig_linux.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jconfig_win.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig_win.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jconfig_win.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig_win.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jerror.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jerror.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jerror.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jerror.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jmorecfg.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jmorecfg.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jmorecfg.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jmorecfg.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jpeglib.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jpeglib.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jpeglib.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jpeglib.h diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libjpeg/libs/armeabi-v7a/libjpeg.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libjpeg.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libjpeg/libs/armeabi-v7a/libjpeg.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libjpeg/libs/armeabi/libjpeg.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi/libjpeg.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libjpeg/libs/armeabi/libjpeg.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libjpeg/libs/x86/libjpeg.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/x86/libjpeg.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libjpeg/libs/x86/libjpeg.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libpng/png.h.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libpng/include/png.h.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libpng/png.h.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libpng/include/png.h.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libpng/pngconf.h b/cocos2dx/platform/third_party/android/modules/libpng/include/pngconf.h similarity index 100% rename from cocos2dx/platform/third_party/android/libpng/pngconf.h rename to cocos2dx/platform/third_party/android/modules/libpng/include/pngconf.h diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libpng/libs/armeabi-v7a/libpng.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libpng.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libpng/libs/armeabi-v7a/libpng.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libpng/libs/armeabi/libpng.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi/libpng.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libpng/libs/armeabi/libpng.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libpng/libs/x86/libpng.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/x86/libpng.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libpng/libs/x86/libpng.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/DOCBparser.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/DOCBparser.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/DOCBparser.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/DOCBparser.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/HTMLparser.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/HTMLparser.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/HTMLparser.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/HTMLparser.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/HTMLtree.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/HTMLtree.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/HTMLtree.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/HTMLtree.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/SAX.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/SAX.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/SAX.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/SAX.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/SAX2.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/SAX2.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/SAX2.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/SAX2.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/c14n.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/c14n.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/c14n.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/c14n.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/catalog.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/catalog.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/catalog.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/catalog.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/chvalid.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/chvalid.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/chvalid.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/chvalid.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/debugXML.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/debugXML.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/debugXML.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/debugXML.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/dict.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/dict.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/dict.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/dict.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/encoding.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/encoding.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/encoding.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/encoding.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/entities.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/entities.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/entities.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/entities.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/globals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/globals.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/globals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/globals.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/hash.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/hash.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/hash.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/hash.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/list.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/list.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/list.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/list.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/nanoftp.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/nanoftp.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/nanoftp.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/nanoftp.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/nanohttp.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/nanohttp.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/nanohttp.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/nanohttp.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/parser.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/parser.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/parser.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/parser.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/parserInternals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/parserInternals.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/parserInternals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/parserInternals.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/pattern.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/pattern.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/pattern.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/pattern.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/relaxng.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/relaxng.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/relaxng.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/relaxng.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/schemasInternals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/schemasInternals.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/schemasInternals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/schemasInternals.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/schematron.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/schematron.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/schematron.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/schematron.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/threads.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/threads.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/threads.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/threads.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/tree.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/tree.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/tree.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/tree.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/uri.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/uri.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/uri.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/uri.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/valid.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/valid.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/valid.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/valid.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xinclude.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xinclude.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xinclude.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xinclude.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xlink.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xlink.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xlink.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xlink.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlIO.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlIO.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlIO.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlIO.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlautomata.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlautomata.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlautomata.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlautomata.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlerror.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlerror.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlerror.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlerror.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlexports.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlexports.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlexports.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlexports.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlmemory.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlmemory.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlmemory.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlmemory.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlmodule.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlmodule.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlmodule.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlmodule.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlreader.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlreader.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlreader.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlreader.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlregexp.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlregexp.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlregexp.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlregexp.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlsave.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlsave.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlsave.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlsave.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemas.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlschemas.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemas.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlschemas.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemastypes.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlschemastypes.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemastypes.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlschemastypes.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlstring.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlstring.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlstring.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlstring.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlunicode.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlunicode.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlunicode.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlunicode.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlversion.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlversion.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlversion.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlversion.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlwriter.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlwriter.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlwriter.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xmlwriter.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xpath.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xpath.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xpath.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xpath.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xpathInternals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xpathInternals.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xpathInternals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xpathInternals.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xpointer.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/xpointer.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xpointer.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/xpointer.h diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libxml2/libs/armeabi-v7a/libxml2.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libxml2.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libxml2/libs/armeabi-v7a/libxml2.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libxml2/libs/armeabi/libxml2.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi/libxml2.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libxml2/libs/armeabi/libxml2.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libxml2/libs/x86/libxml2.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/x86/libxml2.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libxml2/libs/x86/libxml2.a.REMOVED.git-id From b0b5790e065a8f53a33214fdaffb614cf91082ee Mon Sep 17 00:00:00 2001 From: folecr Date: Fri, 27 Jan 2012 16:37:32 -0800 Subject: [PATCH 3/6] Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7. * Uses NDK modules as the basis of the build system for Android NDK * Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so * The dependencies of this module are also Android NDK modules * ... which are prebuilt static libraries from the png, jpeg and xml2 modules. * Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared. --- cocos2dx/Android.mk | 30 +++++++++++-------- .../android/modules/libjpeg/Android.mk | 8 +++++ .../android/modules/libpng/Android.mk | 8 +++++ .../android/modules/libxml2/Android.mk | 8 +++++ 4 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 cocos2dx/platform/third_party/android/modules/libjpeg/Android.mk create mode 100644 cocos2dx/platform/third_party/android/modules/libpng/Android.mk create mode 100644 cocos2dx/platform/third_party/android/modules/libxml2/Android.mk diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index 6a97c70c6d..1c90e2bcad 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -1,8 +1,10 @@ LOCAL_PATH := $(call my-dir) -# compile cocos2d.so include $(CLEAR_VARS) -LOCAL_MODULE := libcocos2d + +LOCAL_MODULE := cocos2dx_shared + +LOCAL_MODULE_FILENAME := cocos2d LOCAL_SRC_FILES := \ CCConfiguration.cpp \ @@ -106,19 +108,21 @@ touch_dispatcher/CCTouchHandler.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/platform \ - $(LOCAL_PATH)/platform/third_party/android/iconv \ - $(LOCAL_PATH)/platform/third_party/android/libpng \ - $(LOCAL_PATH)/platform/third_party/android/libxml2 \ - $(LOCAL_PATH)/platform/third_party/android/libjpeg + $(LOCAL_PATH)/platform -LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) \ - -lGLESv1_CM -llog -lz \ - -lpng \ - -lxml2 \ - -ljpeg +LOCAL_LDLIBS := -lGLESv1_CM \ + -llog \ + -lz + +LOCAL_STATIC_LIBRARIES := png_static_prebuilt +LOCAL_STATIC_LIBRARIES += xml2_static_prebuilt +LOCAL_STATIC_LIBRARIES += jpeg_static_prebuilt # define the macro to compile through support/zip_support/ioapi.c LOCAL_CFLAGS := -DUSE_FILE32API - + include $(BUILD_SHARED_LIBRARY) + +$(call import-module,platform/third_party/android/modules/libpng) +$(call import-module,platform/third_party/android/modules/libxml2) +$(call import-module,platform/third_party/android/modules/libjpeg) diff --git a/cocos2dx/platform/third_party/android/modules/libjpeg/Android.mk b/cocos2dx/platform/third_party/android/modules/libjpeg/Android.mk new file mode 100644 index 0000000000..6650eeb07d --- /dev/null +++ b/cocos2dx/platform/third_party/android/modules/libjpeg/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := jpeg_static_prebuilt +LOCAL_MODULE_FILENAME := jpeg +LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libjpeg.a +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include +include $(PREBUILT_STATIC_LIBRARY) diff --git a/cocos2dx/platform/third_party/android/modules/libpng/Android.mk b/cocos2dx/platform/third_party/android/modules/libpng/Android.mk new file mode 100644 index 0000000000..a45560e59b --- /dev/null +++ b/cocos2dx/platform/third_party/android/modules/libpng/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := png_static_prebuilt +LOCAL_MODULE_FILENAME := png +LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libpng.a +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include +include $(PREBUILT_STATIC_LIBRARY) diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/Android.mk b/cocos2dx/platform/third_party/android/modules/libxml2/Android.mk new file mode 100644 index 0000000000..060f9bd629 --- /dev/null +++ b/cocos2dx/platform/third_party/android/modules/libxml2/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := xml2_static_prebuilt +LOCAL_MODULE_FILENAME := xml2 +LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libxml2.a +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include +include $(PREBUILT_STATIC_LIBRARY) From 516c56a793386f9c107a1283ee56128ad9b4a24c Mon Sep 17 00:00:00 2001 From: folecr Date: Thu, 2 Feb 2012 20:04:29 -0800 Subject: [PATCH 4/6] Add EXPORT_C_INCLUDES and correct the paths to third party modules --- cocos2dx/Android.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index 1c90e2bcad..6c5ba7a6f1 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -106,6 +106,10 @@ tileMap_parallax_nodes/CCTileMapAtlas.cpp \ touch_dispatcher/CCTouchDispatcher.cpp \ touch_dispatcher/CCTouchHandler.cpp +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ \ + $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/platform + LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/platform @@ -123,6 +127,9 @@ LOCAL_CFLAGS := -DUSE_FILE32API include $(BUILD_SHARED_LIBRARY) -$(call import-module,platform/third_party/android/modules/libpng) -$(call import-module,platform/third_party/android/modules/libxml2) -$(call import-module,platform/third_party/android/modules/libjpeg) +# note that the import-module calls are relative to the parent directory +# this simplifies makefiles that use this module +# it requires only one entry in NDK_MODULE_PATH - the module search path +$(call import-module,cocos2dx/platform/third_party/android/modules/libpng) +$(call import-module,cocos2dx/platform/third_party/android/modules/libxml2) +$(call import-module,cocos2dx/platform/third_party/android/modules/libjpeg) From cab83bb4a6010c390caade5136032d6a4fa5bccb Mon Sep 17 00:00:00 2001 From: folecr Date: Thu, 2 Feb 2012 20:07:37 -0800 Subject: [PATCH 5/6] Fix header file location to match convention in include directives in the cocos source --- .../android/modules/libxml2/include/{ => libxml}/DOCBparser.h | 0 .../android/modules/libxml2/include/{ => libxml}/HTMLparser.h | 0 .../android/modules/libxml2/include/{ => libxml}/HTMLtree.h | 0 .../android/modules/libxml2/include/{ => libxml}/SAX.h | 0 .../android/modules/libxml2/include/{ => libxml}/SAX2.h | 0 .../android/modules/libxml2/include/{ => libxml}/c14n.h | 0 .../android/modules/libxml2/include/{ => libxml}/catalog.h | 0 .../android/modules/libxml2/include/{ => libxml}/chvalid.h | 0 .../android/modules/libxml2/include/{ => libxml}/debugXML.h | 0 .../android/modules/libxml2/include/{ => libxml}/dict.h | 0 .../android/modules/libxml2/include/{ => libxml}/encoding.h | 0 .../android/modules/libxml2/include/{ => libxml}/entities.h | 0 .../android/modules/libxml2/include/{ => libxml}/globals.h | 0 .../android/modules/libxml2/include/{ => libxml}/hash.h | 0 .../android/modules/libxml2/include/{ => libxml}/list.h | 0 .../android/modules/libxml2/include/{ => libxml}/nanoftp.h | 0 .../android/modules/libxml2/include/{ => libxml}/nanohttp.h | 0 .../android/modules/libxml2/include/{ => libxml}/parser.h | 0 .../modules/libxml2/include/{ => libxml}/parserInternals.h | 0 .../android/modules/libxml2/include/{ => libxml}/pattern.h | 0 .../android/modules/libxml2/include/{ => libxml}/relaxng.h | 0 .../modules/libxml2/include/{ => libxml}/schemasInternals.h | 0 .../android/modules/libxml2/include/{ => libxml}/schematron.h | 0 .../android/modules/libxml2/include/{ => libxml}/threads.h | 0 .../android/modules/libxml2/include/{ => libxml}/tree.h | 0 .../android/modules/libxml2/include/{ => libxml}/uri.h | 0 .../android/modules/libxml2/include/{ => libxml}/valid.h | 0 .../android/modules/libxml2/include/{ => libxml}/xinclude.h | 0 .../android/modules/libxml2/include/{ => libxml}/xlink.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlIO.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlautomata.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlerror.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlexports.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlmemory.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlmodule.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlreader.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlregexp.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlsave.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlschemas.h | 0 .../modules/libxml2/include/{ => libxml}/xmlschemastypes.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlstring.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlunicode.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlversion.h | 0 .../android/modules/libxml2/include/{ => libxml}/xmlwriter.h | 0 .../android/modules/libxml2/include/{ => libxml}/xpath.h | 0 .../android/modules/libxml2/include/{ => libxml}/xpathInternals.h | 0 .../android/modules/libxml2/include/{ => libxml}/xpointer.h | 0 47 files changed, 0 insertions(+), 0 deletions(-) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/DOCBparser.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/HTMLparser.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/HTMLtree.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/SAX.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/SAX2.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/c14n.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/catalog.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/chvalid.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/debugXML.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/dict.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/encoding.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/entities.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/globals.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/hash.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/list.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/nanoftp.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/nanohttp.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/parser.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/parserInternals.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/pattern.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/relaxng.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/schemasInternals.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/schematron.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/threads.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/tree.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/uri.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/valid.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xinclude.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xlink.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlIO.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlautomata.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlerror.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlexports.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlmemory.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlmodule.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlreader.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlregexp.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlsave.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlschemas.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlschemastypes.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlstring.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlunicode.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlversion.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xmlwriter.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xpath.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xpathInternals.h (100%) rename cocos2dx/platform/third_party/android/modules/libxml2/include/{ => libxml}/xpointer.h (100%) diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/DOCBparser.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/DOCBparser.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/DOCBparser.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/DOCBparser.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/HTMLparser.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/HTMLparser.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/HTMLparser.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/HTMLparser.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/HTMLtree.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/HTMLtree.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/HTMLtree.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/HTMLtree.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/SAX.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/SAX.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/SAX.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/SAX.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/SAX2.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/SAX2.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/SAX2.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/SAX2.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/c14n.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/c14n.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/c14n.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/c14n.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/catalog.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/catalog.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/catalog.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/catalog.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/chvalid.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/chvalid.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/chvalid.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/chvalid.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/debugXML.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/debugXML.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/debugXML.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/debugXML.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/dict.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/dict.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/dict.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/dict.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/encoding.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/encoding.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/encoding.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/encoding.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/entities.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/entities.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/entities.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/entities.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/globals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/globals.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/globals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/globals.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/hash.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/hash.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/hash.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/hash.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/list.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/list.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/list.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/list.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/nanoftp.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/nanoftp.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/nanoftp.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/nanoftp.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/nanohttp.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/nanohttp.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/nanohttp.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/nanohttp.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/parser.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/parser.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/parser.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/parser.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/parserInternals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/parserInternals.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/parserInternals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/parserInternals.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/pattern.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/pattern.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/pattern.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/pattern.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/relaxng.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/relaxng.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/relaxng.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/relaxng.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/schemasInternals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/schemasInternals.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/schemasInternals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/schemasInternals.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/schematron.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/schematron.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/schematron.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/schematron.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/threads.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/threads.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/threads.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/threads.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/tree.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/tree.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/tree.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/tree.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/uri.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/uri.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/uri.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/uri.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/valid.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/valid.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/valid.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/valid.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xinclude.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xinclude.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xinclude.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xinclude.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xlink.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xlink.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xlink.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xlink.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlIO.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlIO.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlIO.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlIO.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlautomata.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlautomata.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlautomata.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlautomata.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlerror.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlerror.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlerror.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlerror.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlexports.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlexports.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlexports.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlexports.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlmemory.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlmemory.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlmemory.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlmemory.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlmodule.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlmodule.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlmodule.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlmodule.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlreader.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlreader.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlreader.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlreader.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlregexp.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlregexp.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlregexp.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlregexp.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlsave.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlsave.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlsave.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlsave.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlschemas.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlschemas.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlschemas.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlschemas.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlschemastypes.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlschemastypes.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlschemastypes.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlschemastypes.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlstring.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlstring.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlstring.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlstring.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlunicode.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlunicode.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlunicode.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlunicode.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlversion.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlversion.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlversion.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlversion.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xmlwriter.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlwriter.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xmlwriter.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlwriter.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xpath.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpath.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xpath.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpath.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xpathInternals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpathInternals.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xpathInternals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpathInternals.h diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/include/xpointer.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpointer.h similarity index 100% rename from cocos2dx/platform/third_party/android/modules/libxml2/include/xpointer.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpointer.h From 3eeb0c8687354e1cbb409f56f3fc8652ea319436 Mon Sep 17 00:00:00 2001 From: folecr Date: Thu, 2 Feb 2012 23:01:50 -0800 Subject: [PATCH 6/6] fix library name - the makefiles expect the full name of the library including the lib prefix --- cocos2dx/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index 6c5ba7a6f1..d97584fa03 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := cocos2dx_shared -LOCAL_MODULE_FILENAME := cocos2d +LOCAL_MODULE_FILENAME := libcocos2d LOCAL_SRC_FILES := \ CCConfiguration.cpp \