Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #550 from minggo/master 

modify the path to relative path in project setting
This commit is contained in:
minggo 2011-10-16 20:55:25 -07:00
parent 602a7b5bc1 9a834585bb
commit 1eaa5a3f6f
3 changed files with 27 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
HelloWorld/android/gen/org/cocos2dx/application/R.java
View File

@ -1,32 +1,3 @@
<<<<<<< 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. /* AUTO-GENERATED FILE. DO NOT MODIFY.
* *
* This class was automatically generated by the * This class was automatically generated by the
@ -53,7 +24,5 @@ public final class R {
} }
public static final class string { public static final class string {
public static final int app_name=0x7f040000; public static final int app_name=0x7f040000;
public static final int button_ok=0x7f040001;
} }
} }
>>>>>>> e0c620fdfbf253a3e97f1e6153ee0220e30123e5

2
tests/test.linux/.project
View File

@ -98,7 +98,7 @@
<link> <link>
<name>test.android</name> <name>test.android</name>
<type>2</type> <type>2</type>
<location>/home/zhangxm/cocos2d-x/tests/test.android</location> <locationURI>PARENT-1-PROJECT_LOC/test.android</locationURI>
</link> </link>
<link> <link>
<name>tests</name> <name>tests</name>