Changeset 1697Tweet

Timestamp:

Aug 5, 2012, 3:36:03 PM (9 years ago)

Author:

sam

Message:

android: explicitly load stlport_shared when initialising the native object.

File:

• trunk/build/lol-build (modified) (1 diff)

trunk/build/lol-build

@@ -154 +154 @@
             ;;
         android-arm)
-            ./configure --host=arm-linux-androideabi ac_cv_exeext=.so \
-                CPPFLAGS="-Wno-psabi -I$ANDROID_NDK_ROOT/sources/cxx-stl/stlport/stlport -I$ANDROID_NDK_ROOT/sources/cxx-stl/gabi++/include -fpic -fno-exceptions -fno-rtti -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64" \
-                CFLAGS="-march=armv5te -mtune=xscale -msoft-float -mthumb" \
-                CXXFLAGS="-march=armv5te -mtune=xscale -msoft-float -mthumb" \
-                LOL_LIBS="-L$ANDROID_NDK_ROOT/sources/cxx-stl/stlport/libs/armeabi -lstlport_shared -lm -fpic -XCClinker -shared"
+            CPPFLAGS="-Wno-psabi -I$ANDROID_NDK_ROOT/sources/cxx-stl/stlport/stlport -fpic -fno-exceptions -fno-rtti -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64"
+            CFLAGS="-march=armv5te -mtune=xscale -msoft-float -mthumb"
+            CXXFLAGS="-march=armv5te -mtune=xscale -msoft-float -mthumb"
+            LOL_LIBS="-L$ANDROID_NDK_ROOT/sources/cxx-stl/stlport/libs/armeabi -lstlport_shared -lm -fpic -XCClinker -shared"
+            ./configure --host=arm-linux-androideabi ac_cv_exeext=.so CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LOL_LIBS="$LOL_LIBS"
             # FIXME: is this needed?
-            # android update project --path .
-            # ndk-build
-            # ant compile
-            # ndk-build distclean
+            # ant debug
+            # ant debug install
             # ant clean
             ;;