From 4f7e349c0a67d527641308e4ac4b44b607c7e47c Mon Sep 17 00:00:00 2001 From: minggo Date: Mon, 26 Sep 2011 22:38:59 -0700 Subject: [PATCH] set HelloWorld dependence and make it run ok on android emulator --- CocosDenshion/proj.linux/.cproject | 4 + HelloWorld/Linux/.cproject | 1005 ++++++++++++++++- HelloWorld/Linux/.project | 2 + .../gen/org/cocos2dx/application/R.java | 57 +- cocos2dx/proj.linux/.cproject | 10 +- 5 files changed, 1047 insertions(+), 31 deletions(-) diff --git a/CocosDenshion/proj.linux/.cproject b/CocosDenshion/proj.linux/.cproject index 24a6734e59..b65828133e 100755 --- a/CocosDenshion/proj.linux/.cproject +++ b/CocosDenshion/proj.linux/.cproject @@ -70,6 +70,7 @@ + @@ -138,6 +139,7 @@ + @@ -204,6 +206,7 @@ + @@ -270,6 +273,7 @@ + diff --git a/HelloWorld/Linux/.cproject b/HelloWorld/Linux/.cproject index c3dff804db..f91985ea9f 100755 --- a/HelloWorld/Linux/.cproject +++ b/HelloWorld/Linux/.cproject @@ -82,6 +82,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -162,11 +412,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -175,7 +676,7 @@ - + @@ -188,7 +689,7 @@ - + @@ -253,6 +754,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -344,6 +1095,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HelloWorld/Linux/.project b/HelloWorld/Linux/.project index dd7c417d4f..735f8f5c6a 100644 --- a/HelloWorld/Linux/.project +++ b/HelloWorld/Linux/.project @@ -3,6 +3,8 @@ HelloWorld + cocos2dx-base + CocosDenshion diff --git a/HelloWorld/android/gen/org/cocos2dx/application/R.java b/HelloWorld/android/gen/org/cocos2dx/application/R.java index 1788ae79a8..7cd1b24c29 100644 --- a/HelloWorld/android/gen/org/cocos2dx/application/R.java +++ b/HelloWorld/android/gen/org/cocos2dx/application/R.java @@ -1,28 +1,29 @@ -/* 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; - 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.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 game_gl_surfaceview=0x7f050001; + public static final int helloworld_gl_surfaceview=0x7f050002; + public static final int textField=0x7f050000; + } + public static final class layout { + public static final int game_demo=0x7f030000; + public static final int helloworld_demo=0x7f030001; + } + public static final class string { + public static final int app_name=0x7f040000; + public static final int button_ok=0x7f040001; + } +} diff --git a/cocos2dx/proj.linux/.cproject b/cocos2dx/proj.linux/.cproject index 61db1fa4d8..dee1a52f2e 100755 --- a/cocos2dx/proj.linux/.cproject +++ b/cocos2dx/proj.linux/.cproject @@ -58,7 +58,7 @@ - + + @@ -190,6 +192,8 @@ + + @@ -287,6 +291,8 @@ + + @@ -385,6 +391,8 @@ + +