Context Navigation

← Previous Changeset
Next Changeset →

Changeset 14078

Timestamp:

11/30/12 17:34:03 (12 years ago)

Author:

ltnguyen

Message:

FIX: linking error with gsl and standard libs

Location:

issm/trunk-jpl/src/android/ISSM/jni

Files:

: 224 added
: 3 edited

Android.mk (modified) (1 diff)
Application.mk (modified) (1 diff)
gsllib (added)
gsllib/Android.mk (added)
gsllib/gsl (added)
gsllib/gsl/gsl_blas.h (added)
gsllib/gsl/gsl_blas_types.h (added)
gsllib/gsl/gsl_block.h (added)
gsllib/gsl/gsl_block_char.h (added)
gsllib/gsl/gsl_block_complex_double.h (added)
gsllib/gsl/gsl_block_complex_float.h (added)
gsllib/gsl/gsl_block_complex_long_double.h (added)
gsllib/gsl/gsl_block_double.h (added)
gsllib/gsl/gsl_block_float.h (added)
gsllib/gsl/gsl_block_int.h (added)
gsllib/gsl/gsl_block_long.h (added)
gsllib/gsl/gsl_block_long_double.h (added)
gsllib/gsl/gsl_block_short.h (added)
gsllib/gsl/gsl_block_uchar.h (added)
gsllib/gsl/gsl_block_uint.h (added)
gsllib/gsl/gsl_block_ulong.h (added)
gsllib/gsl/gsl_block_ushort.h (added)
gsllib/gsl/gsl_bspline.h (added)
gsllib/gsl/gsl_cblas.h (added)
gsllib/gsl/gsl_cdf.h (added)
gsllib/gsl/gsl_chebyshev.h (added)
gsllib/gsl/gsl_check_range.h (added)
gsllib/gsl/gsl_combination.h (added)
gsllib/gsl/gsl_complex.h (added)
gsllib/gsl/gsl_complex_math.h (added)
gsllib/gsl/gsl_const.h (added)
gsllib/gsl/gsl_const_cgs.h (added)
gsllib/gsl/gsl_const_cgsm.h (added)
gsllib/gsl/gsl_const_mks.h (added)
gsllib/gsl/gsl_const_mksa.h (added)
gsllib/gsl/gsl_const_num.h (added)
gsllib/gsl/gsl_deriv.h (added)
gsllib/gsl/gsl_dft_complex.h (added)
gsllib/gsl/gsl_dft_complex_float.h (added)
gsllib/gsl/gsl_dht.h (added)
gsllib/gsl/gsl_diff.h (added)
gsllib/gsl/gsl_eigen.h (added)
gsllib/gsl/gsl_errno.h (added)
gsllib/gsl/gsl_fft.h (added)
gsllib/gsl/gsl_fft_complex.h (added)
gsllib/gsl/gsl_fft_complex_float.h (added)
gsllib/gsl/gsl_fft_halfcomplex.h (added)
gsllib/gsl/gsl_fft_halfcomplex_float.h (added)
gsllib/gsl/gsl_fft_real.h (added)
gsllib/gsl/gsl_fft_real_float.h (added)
gsllib/gsl/gsl_fit.h (added)
gsllib/gsl/gsl_heapsort.h (added)
gsllib/gsl/gsl_histogram.h (added)
gsllib/gsl/gsl_histogram2d.h (added)
gsllib/gsl/gsl_ieee_utils.h (added)
gsllib/gsl/gsl_inline.h (added)
gsllib/gsl/gsl_integration.h (added)
gsllib/gsl/gsl_interp.h (added)
gsllib/gsl/gsl_linalg.h (added)
gsllib/gsl/gsl_machine.h (added)
gsllib/gsl/gsl_math.h (added)
gsllib/gsl/gsl_matrix.h (added)
gsllib/gsl/gsl_matrix_char.h (added)
gsllib/gsl/gsl_matrix_complex_double.h (added)
gsllib/gsl/gsl_matrix_complex_float.h (added)
gsllib/gsl/gsl_matrix_complex_long_double.h (added)
gsllib/gsl/gsl_matrix_double.h (added)
gsllib/gsl/gsl_matrix_float.h (added)
gsllib/gsl/gsl_matrix_int.h (added)
gsllib/gsl/gsl_matrix_long.h (added)
gsllib/gsl/gsl_matrix_long_double.h (added)
gsllib/gsl/gsl_matrix_short.h (added)
gsllib/gsl/gsl_matrix_uchar.h (added)
gsllib/gsl/gsl_matrix_uint.h (added)
gsllib/gsl/gsl_matrix_ulong.h (added)
gsllib/gsl/gsl_matrix_ushort.h (added)
gsllib/gsl/gsl_message.h (added)
gsllib/gsl/gsl_min.h (added)
gsllib/gsl/gsl_minmax.h (added)
gsllib/gsl/gsl_mode.h (added)
gsllib/gsl/gsl_monte.h (added)
gsllib/gsl/gsl_monte_miser.h (added)
gsllib/gsl/gsl_monte_plain.h (added)
gsllib/gsl/gsl_monte_vegas.h (added)
gsllib/gsl/gsl_multifit.h (added)
gsllib/gsl/gsl_multifit_nlin.h (added)
gsllib/gsl/gsl_multimin.h (added)
gsllib/gsl/gsl_multiroots.h (added)
gsllib/gsl/gsl_multiset.h (added)
gsllib/gsl/gsl_nan.h (added)
gsllib/gsl/gsl_ntuple.h (added)
gsllib/gsl/gsl_odeiv.h (added)
gsllib/gsl/gsl_odeiv2.h (added)
gsllib/gsl/gsl_permutation.h (added)
gsllib/gsl/gsl_permute.h (added)
gsllib/gsl/gsl_permute_char.h (added)
gsllib/gsl/gsl_permute_complex_double.h (added)
gsllib/gsl/gsl_permute_complex_float.h (added)
gsllib/gsl/gsl_permute_complex_long_double.h (added)
gsllib/gsl/gsl_permute_double.h (added)
gsllib/gsl/gsl_permute_float.h (added)
gsllib/gsl/gsl_permute_int.h (added)
gsllib/gsl/gsl_permute_long.h (added)
gsllib/gsl/gsl_permute_long_double.h (added)
gsllib/gsl/gsl_permute_short.h (added)
gsllib/gsl/gsl_permute_uchar.h (added)
gsllib/gsl/gsl_permute_uint.h (added)
gsllib/gsl/gsl_permute_ulong.h (added)
gsllib/gsl/gsl_permute_ushort.h (added)
gsllib/gsl/gsl_permute_vector.h (added)
gsllib/gsl/gsl_permute_vector_char.h (added)
gsllib/gsl/gsl_permute_vector_complex_double.h (added)
gsllib/gsl/gsl_permute_vector_complex_float.h (added)
gsllib/gsl/gsl_permute_vector_complex_long_double.h (added)
gsllib/gsl/gsl_permute_vector_double.h (added)
gsllib/gsl/gsl_permute_vector_float.h (added)
gsllib/gsl/gsl_permute_vector_int.h (added)
gsllib/gsl/gsl_permute_vector_long.h (added)
gsllib/gsl/gsl_permute_vector_long_double.h (added)
gsllib/gsl/gsl_permute_vector_short.h (added)
gsllib/gsl/gsl_permute_vector_uchar.h (added)
gsllib/gsl/gsl_permute_vector_uint.h (added)
gsllib/gsl/gsl_permute_vector_ulong.h (added)
gsllib/gsl/gsl_permute_vector_ushort.h (added)
gsllib/gsl/gsl_poly.h (added)
gsllib/gsl/gsl_pow_int.h (added)
gsllib/gsl/gsl_precision.h (added)
gsllib/gsl/gsl_qrng.h (added)
gsllib/gsl/gsl_randist.h (added)
gsllib/gsl/gsl_rng.h (added)
gsllib/gsl/gsl_roots.h (added)
gsllib/gsl/gsl_sf.h (added)
gsllib/gsl/gsl_sf_airy.h (added)
gsllib/gsl/gsl_sf_bessel.h (added)
gsllib/gsl/gsl_sf_clausen.h (added)
gsllib/gsl/gsl_sf_coulomb.h (added)
gsllib/gsl/gsl_sf_coupling.h (added)
gsllib/gsl/gsl_sf_dawson.h (added)
gsllib/gsl/gsl_sf_debye.h (added)
gsllib/gsl/gsl_sf_dilog.h (added)
gsllib/gsl/gsl_sf_elementary.h (added)
gsllib/gsl/gsl_sf_ellint.h (added)
gsllib/gsl/gsl_sf_elljac.h (added)
gsllib/gsl/gsl_sf_erf.h (added)
gsllib/gsl/gsl_sf_exp.h (added)
gsllib/gsl/gsl_sf_expint.h (added)
gsllib/gsl/gsl_sf_fermi_dirac.h (added)
gsllib/gsl/gsl_sf_gamma.h (added)
gsllib/gsl/gsl_sf_gegenbauer.h (added)
gsllib/gsl/gsl_sf_hyperg.h (added)
gsllib/gsl/gsl_sf_laguerre.h (added)
gsllib/gsl/gsl_sf_lambert.h (added)
gsllib/gsl/gsl_sf_legendre.h (added)
gsllib/gsl/gsl_sf_log.h (added)
gsllib/gsl/gsl_sf_mathieu.h (added)
gsllib/gsl/gsl_sf_pow_int.h (added)
gsllib/gsl/gsl_sf_psi.h (added)
gsllib/gsl/gsl_sf_result.h (added)
gsllib/gsl/gsl_sf_synchrotron.h (added)
gsllib/gsl/gsl_sf_transport.h (added)
gsllib/gsl/gsl_sf_trig.h (added)
gsllib/gsl/gsl_sf_zeta.h (added)
gsllib/gsl/gsl_siman.h (added)
gsllib/gsl/gsl_sort.h (added)
gsllib/gsl/gsl_sort_char.h (added)
gsllib/gsl/gsl_sort_double.h (added)
gsllib/gsl/gsl_sort_float.h (added)
gsllib/gsl/gsl_sort_int.h (added)
gsllib/gsl/gsl_sort_long.h (added)
gsllib/gsl/gsl_sort_long_double.h (added)
gsllib/gsl/gsl_sort_short.h (added)
gsllib/gsl/gsl_sort_uchar.h (added)
gsllib/gsl/gsl_sort_uint.h (added)
gsllib/gsl/gsl_sort_ulong.h (added)
gsllib/gsl/gsl_sort_ushort.h (added)
gsllib/gsl/gsl_sort_vector.h (added)
gsllib/gsl/gsl_sort_vector_char.h (added)
gsllib/gsl/gsl_sort_vector_double.h (added)
gsllib/gsl/gsl_sort_vector_float.h (added)
gsllib/gsl/gsl_sort_vector_int.h (added)
gsllib/gsl/gsl_sort_vector_long.h (added)
gsllib/gsl/gsl_sort_vector_long_double.h (added)
gsllib/gsl/gsl_sort_vector_short.h (added)
gsllib/gsl/gsl_sort_vector_uchar.h (added)
gsllib/gsl/gsl_sort_vector_uint.h (added)
gsllib/gsl/gsl_sort_vector_ulong.h (added)
gsllib/gsl/gsl_sort_vector_ushort.h (added)
gsllib/gsl/gsl_specfunc.h (added)
gsllib/gsl/gsl_spline.h (added)
gsllib/gsl/gsl_statistics.h (added)
gsllib/gsl/gsl_statistics_char.h (added)
gsllib/gsl/gsl_statistics_double.h (added)
gsllib/gsl/gsl_statistics_float.h (added)
gsllib/gsl/gsl_statistics_int.h (added)
gsllib/gsl/gsl_statistics_long.h (added)
gsllib/gsl/gsl_statistics_long_double.h (added)
gsllib/gsl/gsl_statistics_short.h (added)
gsllib/gsl/gsl_statistics_uchar.h (added)
gsllib/gsl/gsl_statistics_uint.h (added)
gsllib/gsl/gsl_statistics_ulong.h (added)
gsllib/gsl/gsl_statistics_ushort.h (added)
gsllib/gsl/gsl_sum.h (added)
gsllib/gsl/gsl_sys.h (added)
gsllib/gsl/gsl_test.h (added)
gsllib/gsl/gsl_types.h (added)
gsllib/gsl/gsl_vector.h (added)
gsllib/gsl/gsl_vector_char.h (added)
gsllib/gsl/gsl_vector_complex.h (added)
gsllib/gsl/gsl_vector_complex_double.h (added)
gsllib/gsl/gsl_vector_complex_float.h (added)
gsllib/gsl/gsl_vector_complex_long_double.h (added)
gsllib/gsl/gsl_vector_double.h (added)
gsllib/gsl/gsl_vector_float.h (added)
gsllib/gsl/gsl_vector_int.h (added)
gsllib/gsl/gsl_vector_long.h (added)
gsllib/gsl/gsl_vector_long_double.h (added)
gsllib/gsl/gsl_vector_short.h (added)
gsllib/gsl/gsl_vector_uchar.h (added)
gsllib/gsl/gsl_vector_uint.h (added)
gsllib/gsl/gsl_vector_ulong.h (added)
gsllib/gsl/gsl_vector_ushort.h (added)
gsllib/gsl/gsl_version.h (added)
gsllib/gsl/gsl_wavelet.h (added)
gsllib/gsl/gsl_wavelet2d.h (added)
gsllib/libsgsl.a (added)
gsllib/libsgslcblas.a (added)
issmlib/Android.mk (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk-jpl/src/android/ISSM/jni/Android.mk

-              r14046
+              r14078
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
 LOCAL_CFLAGS := -Wno-psabi -DHAVE_CONFIG_H
 LOCAL_LDLIBS := -llog -ldl
+LOCAL_LDLIBS := -llog -ldl -lm
 LOCAL_MODULE := IssmJni
 LOCAL_SRC_FILES := Main.cpp
+LOCAL_STATIC_LIBRARIES := libISSMCore
+LOCAL_STATIC_LIBRARIES := libISSMCore libgsl libgslcblas
 include $(BUILD_SHARED_LIBRARY)

issm/trunk-jpl/src/android/ISSM/jni/Application.mk

r14046	r14078
1		APP_STL:=~~stlport~~_static
	1	APP_STL:= gnustl_static
2	2	APP_CPPFLAGS := -frtti
3	3	APP_CPPFLAGS += -fexceptions
	4	APP_ABI := armeabi

issm/trunk-jpl/src/android/ISSM/jni/issmlib/Android.mk

r14047	r14078
5	5	LOCAL_EXPORT_C_INCLUDES := $(ISSM_DIR)
6	6	include $(PREBUILT_STATIC_LIBRARY)
	7

Note: See TracChangeset for help on using the changeset viewer.