Changeset 1219Tweet

Timestamp:

Apr 12, 2012, 12:59:29 AM (11 years ago)

Author:

sam

Message:

android: slightly update Android project for newer SDK versions.

Location:

trunk

Files:

• monsterz/android/build.xml (modified) (3 diffs)
• monsterz/android/default.properties (deleted)
• monsterz/android/jni/Android.mk (modified) (1 diff)
• monsterz/android/project.properties (added)
• src/Makefile.am (modified) (5 diffs)
• src/application/application.cpp (modified) (2 diffs)
• src/platform/android/androidapp.cpp (modified) (2 diffs)
• src/platform/android/androidapp.h (added)

trunk/monsterz/android/build.xml

@@ -2 +2 @@
 <project name="LolActivity" default="help">
 
-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
     <property file="local.properties" />
 
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
          Here are some properties you may want to change/update:
 
@@ -17 +16 @@
          out.dir
              The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
 
          Properties related to the SDK location or the project target should
@@ -25 +27 @@
 
          -->
-    <property file="build.properties" />
+    <property file="ant.properties" />
 
-    <!-- The default.properties file is created and updated by the 'android'
+    <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
          This file is an integral part of the build system for your
          application and should be checked into Version Control Systems. -->
-    <property file="default.properties" />
+    <loadproperties srcFile="project.properties" />
 
-    <!-- Custom Android task to deal with the project target, and import the
-         proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-    </path>
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            unless="sdk.dir"
+    />
 
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
 
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
-
-    [This is typically used for code obfuscation.
-     Compiled code location: ${out.classes.absolute.dir}
-     If this is not done in place, override ${out.dex.input.absolute.dir}]
-    <target name="-post-compile">
-    </target>
--->
-
-
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
+    <!-- Import the actual build file.
 
          To customize existing targets, there are two options:
          - Customize only one target:
              - copy/paste the target into this file, *before* the
-               <setup> task.
+               <import> task.
              - customize it to your needs.
-         - Customize the whole script.
+         - Customize the whole content of build.xml
              - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />.
+               into this file, replacing the <import> task.
              - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
     -->
-    <setup />
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>

trunk/monsterz/android/jni/Android.mk

@@ -10 +10 @@
 LOCAL_CFLAGS := -DDISABLE_IMPORTGL \
                 -DHAVE_GLES_2X \
+                -DHAVE_PTHREAD_H \
                 -I$(LOCAL_PATH)/$(LOL_SRC) \
                 -I$(LOCAL_PATH)/$(MONSTERZ_SRC)

trunk/src/Makefile.am

@@ -23 +23 @@
     $(nacl_sources) \
     $(sdl_sources) \
+    $(android_sources) \
     \
     thread/threadbase.h thread/thread.h \
@@ -32 +33 @@
     \
     image/image.cpp image/image.h image/image-private.h \
-    image/codec/android-image.cpp \
     image/codec/gdiplus-image.cpp \
     image/codec/ios-image.cpp \
-    image/codec/sdl-image.cpp \
-    image/codec/ps3-image.cpp \
     image/codec/dummy-image.cpp \
     \
@@ -46 +44 @@
 
 sdl_sources = \
+    image/codec/sdl-image.cpp \
     platform/sdl/sdlapp.cpp platform/sdl/sdlapp.h \
     platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h
@@ -60 +59 @@
 if HAVE_PS3
 ps3_sources = \
+    image/codec/ps3-image.cpp \
     platform/ps3/threadbase.h \
     platform/ps3/ps3app.cpp platform/ps3/ps3app.h \
@@ -70 +70 @@
 endif
 
+android_sources = \
+    image/codec/android-image.cpp \
+    platform/android/androidapp.cpp platform/android/androidapp.h
+

trunk/src/application/application.cpp

@@ -22 +22 @@
 #elif defined __native_client__
 #   include "platform/nacl/naclapp.h"
+#elif defined __ANDROID__
+#   include "platform/android/androidapp.h"
 #elif defined HAVE_GLES_2X
 #   include "eglapp.h"
@@ -48 +50 @@
 #elif defined __native_client__
     NaClApp app;
+#elif defined __ANDROID__
+    AndroidApp app;
 #elif defined HAVE_GLES_2X
     /* FIXME: this macro is only deactivated if we include "lolgl.h" */

trunk/src/platform/android/androidapp.cpp

@@ -17 +17 @@
 
 #include "core.h"
-#include "lolgl.h"
 #include "loldebug.h"
+#include "androidapp.h"
 
 using namespace lol;
+
+/* Monsterz-specific */
+#include "interface.h"
 
 namespace lol
@@ -26 +29 @@
 JavaVM *g_vm;
 jobject g_activity;
+
+AndroidApp::AndroidApp(char const *title, ivec2 res, float fps) :
+    data(0)
+{
+}
+
+void AndroidApp::ShowPointer(bool show)
+{
+}
+
+void AndroidApp::Run()
+{
+    while (!Ticker::Finished())
+    {
+        /* Tick the renderer, show the frame and clamp to desired framerate. */
+        Ticker::TickDraw();
+    }
+}
+
+AndroidApp::~AndroidApp()
+{
+}
+
 };