Merge pull request #532 from minggo/iss717

Iss717

AUTHORS

@@ -30,6 +30,10 @@ Developers:
 
     Dumganhar
         author of Bada port
+        
+    ciaranj 
+        add a build file that correctly generates LuaCocos2d.cpp
+        add a lua template
 
 Cocos2d-x can not grow so fast without the active community.
 Thanks to all developers who report & trace bugs, dicuss the engine usage in forum & QQ groups!

HelloLua/android/gen/org/cocos2dx/hellolua/R.java

@@ -22,6 +22,5 @@ public final class R {
     }
     public static final class string {
         public static final int app_name=0x7f040000;
-        public static final int button_ok=0x7f040001;
     }
 }

HelloLua/android/res/values/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">HelloLua</string>
-    <string name="button_ok">Ok</string>
+    <string name="app_name">HelloLua</string>
 </resources>

HelloLua/android/src/org/cocos2dx/lib/Cocos2dxActivity.java

@@ -24,8 +24,6 @@ THE SOFTWARE.
 
 package org.cocos2dx.lib;
 
-import org.cocos2dx.application.R;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -226,7 +224,7 @@ public class Cocos2dxActivity extends Activity{
     	Dialog dialog = new AlertDialog.Builder(this)
 	    .setTitle(title)
 	    .setMessage(message)
-	    .setPositiveButton(R.string.button_ok, 
+	    .setPositiveButton("Ok", 
 	    new DialogInterface.OnClickListener()
 	    {
 	    	public void onClick(DialogInterface dialog, int whichButton){

HelloWorld/android/gen/org/cocos2dx/application/R.java

@@ -1,3 +1,32 @@
+<<<<<<< HEAD
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package org.cocos2dx.application;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class id {
+        public static final int helloworld_gl_surfaceview=0x7f050001;
+        public static final int textField=0x7f050000;
+    }
+    public static final class layout {
+        public static final int helloworld_demo=0x7f030000;
+        public static final int mylayout=0x7f030001;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040000;
+    }
+}
+=======
 /* AUTO-GENERATED FILE.  DO NOT MODIFY.
  *
  * This class was automatically generated by the
@@ -27,3 +56,4 @@ public final class R {
         public static final int button_ok=0x7f040001;
     }
 }
+>>>>>>> e0c620fdfbf253a3e97f1e6153ee0220e30123e5

HelloWorld/android/res/values/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">helloworld</string>
-    <string name="button_ok">Ok</string>
 </resources>

HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxActivity.java

@@ -24,8 +24,6 @@ THE SOFTWARE.
 
 package org.cocos2dx.lib;
 
-import org.cocos2dx.application.R;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -226,7 +224,7 @@ public class Cocos2dxActivity extends Activity{
     	Dialog dialog = new AlertDialog.Builder(this)
 	    .setTitle(title)
 	    .setMessage(message)
-	    .setPositiveButton(R.string.button_ok, 
+	    .setPositiveButton("Ok",
 	    new DialogInterface.OnClickListener()
 	    {
 	    	public void onClick(DialogInterface dialog, int whichButton){

tests/test.android/gen/org/cocos2dx/tests/R.java

@@ -1,27 +1,26 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.cocos2dx.tests;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    }
-    public static final class id {
-        public static final int test_demo_gl_surfaceview=0x7f050001;
-        public static final int textField=0x7f050000;
-    }
-    public static final class layout {
-        public static final int test_demo=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int button_ok=0x7f040001;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package org.cocos2dx.tests;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class id {
+        public static final int test_demo_gl_surfaceview=0x7f050001;
+        public static final int textField=0x7f050000;
+    }
+    public static final class layout {
+        public static final int test_demo=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040000;
+    }
+}

tests/test.android/res/values/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">tests</string>
-    <string name="button_ok">Ok</string>
 </resources>

tests/test.android/src/org/cocos2dx/lib/Cocos2dxActivity.java

@@ -24,10 +24,6 @@ THE SOFTWARE.
 
 package org.cocos2dx.lib;
 
-
-
-import org.cocos2dx.tests.R;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -228,7 +224,7 @@ public class Cocos2dxActivity extends Activity{
     	Dialog dialog = new AlertDialog.Builder(this)
 	    .setTitle(title)
 	    .setMessage(message)
-	    .setPositiveButton(R.string.button_ok, 
+	    .setPositiveButton("Ok", 
 	    new DialogInterface.OnClickListener()
 	    {
 	    	public void onClick(DialogInterface dialog, int whichButton){