Changeset 2576


Ignore:
Timestamp:
Mar 10, 2013, 12:04:58 AM (7 years ago)
Author:
sam
Message:

build: big Android build system refactor; we now attempt to build
an apk for each project.

Location:
trunk
Files:
1 added
4 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/build/autotools/common.am

    r2575 r2576  
    103103
    104104#
     105# Android rules
     106#
     107
     108all-local: all-local-android
     109clean-local: clean-local-android
     110if USE_ANDROID
     111all-local-android: $(foreach p, $(PROGRAMS:%$(EXEEXT)=%), $($(p)_DATA))
     112        $(foreach p, $(PROGRAMS:%$(EXEEXT)=%), \
     113            rm -rf "android-$(p)"; \
     114            $(MKDIR_P) "android-$(p)" $(sort $(foreach f, $($(p)_DATA), "android-$(p)/assets/$(dir $(f))")); \
     115            $(foreach f, $($(p)_DATA), $(LN_S) "$(abs_srcdir)/$(f)" "android-$(p)/assets/$(f)";) \
     116            $(SED) -e 's,@PROGRAM@,$(p),' "$(top_srcdir)/build/android/AndroidManifest.xml" > "android-$(p)/AndroidManifest.xml"; \
     117            $(MKDIR_P) "android-$(p)/src/net/lolengine"; \
     118            $(SED) -e 's,@PROGRAM@,$(p),' "$(top_srcdir)/build/android/LolActivity.java" > "android-$(p)/src/net/lolengine/LolActivity.java"; \
     119            $(MKDIR_P) "android-$(p)/res/values"; \
     120            $(SED) -e 's,@PROGRAM@,$(p),' "$(top_srcdir)/build/android/strings.xml" > "android-$(p)/res/values/strings.xml"; \
     121            $(MKDIR_P) "android-$(p)/res/drawable"; \
     122            cp "$(top_srcdir)/build/android/icon.png" "android-$(p)/res/drawable/"; \
     123            $(MKDIR_P) "android-$(p)/libs/armeabi"; \
     124            $(LN_S) "$(abs_builddir)/$(p).so" "android-$(p)/libs/armeabi/lib$(p).so"; \
     125            $(LN_S) "$${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so" "android-$(p)/libs/armeabi"; \
     126            android update project -t android-8 -p "android-$(p)"; \
     127            ant debug -f "android-$(p)/build.xml"; \
     128        )
     129else
     130all-local-android:
     131endif
     132clean-local-android:
     133        $(foreach p, $(PROGRAMS:%$(EXEEXT)=%), rm -rf "android-$(p)";)
     134
     135
     136#
    105137# Additional rules
    106138#
    107139
    108 EXTRA_DIST += $(foreach p, $(noinst_PROGRAMS), $($(p)_DATA))
    109 EXTRA_DIST += $(foreach p, $(bin_PROGRAMS), $($(p)_DATA))
     140EXTRA_DIST += $(foreach p, $(PROGRAMS), $($(p)_DATA))
    110141
    111142
  • trunk/src/lua/llex.c

    r2542 r2576  
    1111#include <locale.h>
    1212#include <string.h>
     13
     14#if defined __ANDROID__ // LOL BEGIN
     15#   define getlocaledecpoint() '.'
     16#endif // LOL END
    1317
    1418#define llex_c
  • trunk/src/platform/android/androidapp.cpp

    r2506 r2576  
    9696
    9797extern "C" void
    98 Java_org_zoy_LolEngine_LolActivity_nativeInit(JNIEnv* env, jobject thiz)
     98Java_net_lolengine_LolActivity_nativeInit(JNIEnv* env, jobject thiz)
    9999{
    100100    Log::Info("Java layer initialising activity 0x%08lx", (long)thiz);
     
    104104
    105105extern "C" void
    106 Java_org_zoy_LolEngine_LolRenderer_nativeInit(JNIEnv* env)
     106Java_net_lolengine_LolRenderer_nativeInit(JNIEnv* env)
    107107{
    108108    /* Initialise app thread and wait for it to be ready, ie. set
     
    121121
    122122extern "C" void
    123 Java_org_zoy_LolEngine_LolRenderer_nativeResize(JNIEnv* env, jobject thiz,
     123Java_net_lolengine_LolRenderer_nativeResize(JNIEnv* env, jobject thiz,
    124124                                                jint w, jint h)
    125125{
     
    129129
    130130extern "C" void
    131 Java_org_zoy_LolEngine_LolRenderer_nativeDone(JNIEnv* env)
     131Java_net_lolengine_LolRenderer_nativeDone(JNIEnv* env)
    132132{
    133133    /* FIXME: clean up */
     
    136136
    137137extern "C" void
    138 Java_org_zoy_LolEngine_LolView_nativePause(JNIEnv* env)
     138Java_net_lolengine_LolView_nativePause(JNIEnv* env)
    139139{
    140140    /* TODO: unimplemented */
     
    142142
    143143extern "C" void
    144 Java_org_zoy_LolEngine_LolView_nativeDown(JNIEnv* env)
     144Java_net_lolengine_LolView_nativeDown(JNIEnv* env)
    145145{
    146146    Input::SetMouseButton(0);
     
    148148
    149149extern "C" void
    150 Java_org_zoy_LolEngine_LolView_nativeUp(JNIEnv* env)
     150Java_net_lolengine_LolView_nativeUp(JNIEnv* env)
    151151{
    152152    Input::UnsetMouseButton(0);
     
    154154
    155155extern "C" void
    156 Java_org_zoy_LolEngine_LolView_nativeMove(JNIEnv* env, jobject thiz,
     156Java_net_lolengine_LolView_nativeMove(JNIEnv* env, jobject thiz,
    157157                                          jint x, jint y)
    158158{
     
    162162/* Call to render the next GL frame */
    163163extern "C" void
    164 Java_org_zoy_LolEngine_LolRenderer_nativeRender(JNIEnv* env)
     164Java_net_lolengine_LolRenderer_nativeRender(JNIEnv* env)
    165165{
    166166    Ticker::TickDraw();
  • trunk/tools/neercs/Makefile.am

    r2575 r2576  
    22include $(top_srcdir)/build/autotools/common.am
    33
     4if !USE_ANDROID
    45if BUILD_NEERCS
    56bin_PROGRAMS = neercs
     7endif
    68endif
    79
Note: See TracChangeset for help on using the changeset viewer.