port TMX layer to android(just pass the syntax check), need to work o…

…n run-time check later
ciaranj · Dec 29, 2010 · fbe7b4d · fbe7b4d
1 parent 2694557
commit fbe7b4d
Show file tree

Hide file tree

Showing 27 changed files with 2,706 additions and 2,000 deletions.
diff --git a/cocos2d-android/.classpath b/cocos2d-android/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="lib" path="libs/commons-codec-1.4.jar"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="libs/JBox2D-2.0.1-b250-Library.jar"/>

diff --git a/cocos2d-android/AndroidManifest.xml b/cocos2d-android/AndroidManifest.xml
@@ -155,10 +155,16 @@
                 <category android:name="android.intent.category.TEST"/>
             </intent-filter>
         </activity>
-
-
-
 
+        <activity android:name=".tests.TileMapTest"
+                  android:debuggable="true"
+                  android:launchMode="singleInstance"
+                  android:label="@string/activity_tilemaptest">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.TEST"/>
+            </intent-filter>
+        </activity>
 
 
         <activity android:name=".tests.MotionStreakTest"

diff --git a/cocos2d-android/libs/commons-codec-1.4.jar b/cocos2d-android/libs/commons-codec-1.4.jar
diff --git a/cocos2d-android/res/values/strings.xml b/cocos2d-android/res/values/strings.xml
@@ -16,6 +16,7 @@
     <string name="activity_motionstreaktest"> Motion Streak Test </string>
     <string name="activity_particletest"> Particle Test </string>
     <string name="activity_schedulertest"> Scheduler Test </string>
+    <string name="activity_tilemaptest"> Tile Map Test </string>
 
     <string name="activity_scenetest">Scene Test</string>
     <string name="activity_spritestest">Sprites Test</string>

diff --git a/cocos2d-android/src/org/cocos2d/layers/CCTMXLayer.h b/cocos2d-android/src/org/cocos2d/layers/CCTMXLayer.h