Changeset 13709

Timestamp:

10/16/12 21:28:33 (12 years ago)

Author:

Eric.Larour

Message:

CHG: new android directory in c/ for android objects.
new fac class with factorial routine to test JNI interfacing.

Location:

issm/trunk-jpl

Files:

• configs/config-arm-linux.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (2 diffs)
• src/c/android (added)
• src/c/android/fac.cpp (added)
• src/c/android/fac.h (added)

issm/trunk-jpl/configs/config-arm-linux.sh ¶

@@ -6 +6 @@
     --host="arm-linux-androideabi" \
     --enable-shared \
+    --with-android\
     --without-fortran \
         --without-wrappers \

issm/trunk-jpl/m4/issm_options.m4 ¶

@@ -1402 +1402 @@
         AC_MSG_RESULT($HAVE_RIFTS)
         dnl }}}
+        dnl with-android{{{
+        AC_ARG_WITH([android],
+                AS_HELP_STRING([--with-android = YES], [compile with android capabilities (default is no)]),
+                [ANDROID=$withval],[ANDROID=no]) 
+        AC_MSG_CHECKING(for android capability compilation)
+
+        if test "x$ANDROID" = "xyes"; then
+
+                dnl defaults
+                HAVE_ANDROID=yes
+
+                AC_DEFINE([_HAVE_ANDROID_],[1],[with android capability])
+        else
+                HAVE_ANDROID=no
+        fi
+        AM_CONDITIONAL([ANDROID], [test x$HAVE_ANDROID = xyes])
+        AC_MSG_RESULT($HAVE_ANDROID)
+        dnl }}}
         dnl with-3d{{{
         AC_ARG_WITH([3d],

issm/trunk-jpl/src/c/Makefile.am ¶

@@ -546 +546 @@
                                     ./modules/ConstraintsStatex/RiftConstraintsState.cpp
 #}}}
+#Android sources  {{{
+android_sources = ./android/fac.h\
+                                  ./android/fac.cpp
+#}}}
 #3D sources  {{{
 threed_sources = ./classes/gauss/GaussPenta.h\
@@ -941 +945 @@
 endif
 
+if ANDROID
+issm_sources +=  $(android_sources)
+endif
+
 if THREED
 issm_sources +=  $(threed_sources)