From 5e5b008742671a9e1ffc2c3956480b7607f2f4cf Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat, 21 Jul 2012 13:49:20 +0800
Subject: [PATCH] issue #1399: Built four android projects(HelloCpp, HelloLua,
 TestJavascript, TestCpp) successfully on Ubuntu System.

---
 cocos2dx/Android.mk                                | 12 ++++++------
 cocos2dx/include/cocos2d.h                         | 14 +++++++-------
 samples/HelloCpp/proj.android/build_native.sh      |  4 ++--
 samples/HelloLua/proj.android/build_native.sh      |  4 ++--
 samples/TestCpp/proj.android/build_native.sh       |  4 ++--
 .../TestJavascript/proj.android/build_native.sh    |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)
 mode change 100644 => 100755 samples/TestCpp/proj.android/build_native.sh
 mode change 100644 => 100755 samples/TestJavascript/proj.android/build_native.sh

diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk
index 7349deaaf3..c293dab172 100644
--- a/cocos2dx/Android.mk
+++ b/cocos2dx/Android.mk
@@ -118,12 +118,12 @@ textures/CCTexture2D.cpp \
 textures/CCTextureAtlas.cpp \
 textures/CCTextureCache.cpp \
 textures/CCTexturePVR.cpp \
-tileMap_parallax_nodes/CCParallaxNode.cpp \
-tileMap_parallax_nodes/CCTMXLayer.cpp \
-tileMap_parallax_nodes/CCTMXObjectGroup.cpp \
-tileMap_parallax_nodes/CCTMXTiledMap.cpp \
-tileMap_parallax_nodes/CCTMXXMLParser.cpp \
-tileMap_parallax_nodes/CCTileMapAtlas.cpp \
+tilemap_parallax_nodes/CCParallaxNode.cpp \
+tilemap_parallax_nodes/CCTMXLayer.cpp \
+tilemap_parallax_nodes/CCTMXObjectGroup.cpp \
+tilemap_parallax_nodes/CCTMXTiledMap.cpp \
+tilemap_parallax_nodes/CCTMXXMLParser.cpp \
+tilemap_parallax_nodes/CCTileMapAtlas.cpp \
 touch_dispatcher/CCTouchDispatcher.cpp \
 touch_dispatcher/CCTouchHandler.cpp 
 
diff --git a/cocos2dx/include/cocos2d.h b/cocos2dx/include/cocos2d.h
index b80f116714..42b4784b0a 100755
--- a/cocos2dx/include/cocos2d.h
+++ b/cocos2dx/include/cocos2d.h
@@ -186,13 +186,13 @@ THE SOFTWARE.
 #include "textures/CCTextureCache.h"
 #include "textures/CCTexturePVR.h"
 
-// tileMap_parallax_nodes
-#include "tileMap_parallax_nodes/CCParallaxNode.h"
-#include "tileMap_parallax_nodes/CCTMXLayer.h"
-#include "tileMap_parallax_nodes/CCTMXObjectGroup.h"
-#include "tileMap_parallax_nodes/CCTMXTiledMap.h"
-#include "tileMap_parallax_nodes/CCTMXXMLParser.h"
-#include "tileMap_parallax_nodes/CCTileMapAtlas.h"
+// tilemap_parallax_nodes
+#include "tilemap_parallax_nodes/CCParallaxNode.h"
+#include "tilemap_parallax_nodes/CCTMXLayer.h"
+#include "tilemap_parallax_nodes/CCTMXObjectGroup.h"
+#include "tilemap_parallax_nodes/CCTMXTiledMap.h"
+#include "tilemap_parallax_nodes/CCTMXXMLParser.h"
+#include "tilemap_parallax_nodes/CCTileMapAtlas.h"
 
 // touch_dispatcher
 #include "touch_dispatcher/CCTouch.h"
diff --git a/samples/HelloCpp/proj.android/build_native.sh b/samples/HelloCpp/proj.android/build_native.sh
index bdfa91432f..791b5c05e2 100755
--- a/samples/HelloCpp/proj.android/build_native.sh
+++ b/samples/HelloCpp/proj.android/build_native.sh
@@ -1,6 +1,6 @@
 # set params
-NDK_ROOT_LOCAL=/cygdrive/e/android/android-ndk-r8
-COCOS2DX_ROOT_LOCAL=/cygdrive/f/Project/dumganhar/cocos2d-x
+NDK_ROOT_LOCAL=/home/james/Software/android/android-ndk-r8b
+COCOS2DX_ROOT_LOCAL=/home/james/Project/cocos2d-x
 
 buildexternalsfromsource=
 
diff --git a/samples/HelloLua/proj.android/build_native.sh b/samples/HelloLua/proj.android/build_native.sh
index 20d304947a..610eefabe0 100755
--- a/samples/HelloLua/proj.android/build_native.sh
+++ b/samples/HelloLua/proj.android/build_native.sh
@@ -1,6 +1,6 @@
 # set params
-NDK_ROOT_LOCAL=/cygdrive/e/android/android-ndk-r8
-COCOS2DX_ROOT_LOCAL=/cygdrive/f/Project/dumganhar/cocos2d-x
+NDK_ROOT_LOCAL=/home/james/Software/android/android-ndk-r8b
+COCOS2DX_ROOT_LOCAL=/home/james/Project/cocos2d-x
 
 buildexternalsfromsource=
 
diff --git a/samples/TestCpp/proj.android/build_native.sh b/samples/TestCpp/proj.android/build_native.sh
old mode 100644
new mode 100755
index eb278ce216..ace21615f9
--- a/samples/TestCpp/proj.android/build_native.sh
+++ b/samples/TestCpp/proj.android/build_native.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # set params
-NDK_ROOT_LOCAL=/cygdrive/e/android/android-ndk-r8
-COCOS2DX_ROOT_LOCAL=/cygdrive/f/Project/dumganhar/cocos2d-x
+NDK_ROOT_LOCAL=/home/james/Software/android/android-ndk-r8b
+COCOS2DX_ROOT_LOCAL=/home/james/Project/cocos2d-x
 
 buildexternalsfromsource=
 
diff --git a/samples/TestJavascript/proj.android/build_native.sh b/samples/TestJavascript/proj.android/build_native.sh
old mode 100644
new mode 100755
index a3cdda61fe..971d0002ad
--- a/samples/TestJavascript/proj.android/build_native.sh
+++ b/samples/TestJavascript/proj.android/build_native.sh
@@ -1,6 +1,6 @@
 # set params
-NDK_ROOT_LOCAL=/cygdrive/e/android/android-ndk-r8
-COCOS2DX_ROOT_LOCAL=/cygdrive/f/Project/dumganhar/cocos2d-x
+NDK_ROOT_LOCAL=/home/james/Software/android/android-ndk-r8b
+COCOS2DX_ROOT_LOCAL=/home/james/Project/cocos2d-x
 
 buildexternalsfromsource=