Changeset 12115

Timestamp:

04/24/12 18:23:23 (13 years ago)

Author:

glperez

Message:

Created the install script for GSL to cross-compile for arm-linux-android and made minor modifications to other scripts.

Location:

issm/trunk-jpl

Files:

• externalpackages/gsl/install-android-4.0.sh (added)
• externalpackages/triangle/configs/android/android-4.0/configure.make (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/externalpackages/triangle/configs/android/android-4.0/configure.make

@@ -11 +11 @@
 
 ANDROID_BIN=$(ISSM_TIER)/src/android/tmp/android-14-toolchain/bin
-CC=$(ANDROID_DEV_DIR)/tmp/android-linux-4.0/bin/arm-linux-androideabi-gcc
-AR=$(ANDROID_DEV_DIR)/tmp/android-linux-4.0/bin/arm-linux-androideabi-ar
-RANLIB=$(ANDROID_DEV_DIR)/tmp/android-linux-4.0/bin/arm-linux-androideabi-ranlib
-CSWITCHES = $(CFLAGS)  -I/usr/X11R6/include -L/usr/X11R6/lib -I$(MATLAB_DIR)/extern/include -fPIC -I$(MATLAB_DIR)/include
+CC=$(ANDROID_DIR)/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
+AR=$(ANDROID_DIR)/arm-linux-android-4.0/bin/arm-linux-androideabi-ar
+RANLIB=$(ANDROID_DIR)/arm-linux-android-4.0/bin/arm-linux-androideabi-ranlib
+CSWITCHES = $(CFLAGS)
 TRILIBDEFS = -DTRILIBRARY
 OBJ_EXT=o

issm/trunk-jpl/m4/issm_options.m4

@@ -65 +65 @@
                         export CXXFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
                         export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
+                elif test $VENDOR = arm-linux; then
+                        export CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-cc
+                        export CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-cc
+
                 else
                 AC_MSG_ERROR([unknow compiler vendor!])