fixed 2!:n under android

Android.mk

@@ -1,33 +1,92 @@
-# This make file can be usedS to build J as part of an Android project.
+# This make file can be used to build J as part of an Android project.
 # The project it was created for is hosted on github at
 # https://github.com/mdykman/jconsole_for_android .
-# openj should be checked out into a seperate folder under 
-# <project-root>/jni . That project is equipped with an Android.mk 
+# openj should be checked out into a seperate folder under
+# <project-root>/jni . That project is equipped with an Android.mk
 # file which will invoke this one.
 # Further detais on building J within the Android
 # context can be found in that project
 #
+# this has been built under Android 2.1, API level 7. see note below
 # this has been built under Android 2.2, API level 8.
 
+# TARGET PLATFORMS
+
+# As long as graphics are not a defining goal,
+# Android 2.1 (API 7) has been selected as the
+# target platform to admit the largest possible
+# potential user base.
+# Android 2.2 (API 8) offers a great deal more
+# graphical power to applications with the
+# inclusion of libGLESv2.so and should be the
+# target for future builds hoping to integrate
+# native graphics into the Android app.
+
+# When building under Android API 7 (2.1)
+# hostdefs.c fails to build as that platform
+# lacks regex.h.  Under API 8 (2.2), the
+# include below should be uncommented.
+# The current release for Android 2.1 includes
+# XXX_defs.ijs files generated under API 8.
+# I am confident that these are sufficient
+# for the present build.
+
+
+
+## edited by md - removed -pedantic from the build flags as it was creating much distracting noise in a build cycle.
+
 LOCAL_PATH := $(call my-dir)
 
+# include $(CLEAR_VARS)
+# LOCAL_MODULE    := libm6
+# LOCAL_SRC_FILES := libm6.a
+
+# include $(PREBUILT_STATIC_LIBRARY)
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := j
 
-LOCAL_LDLIBS := -llog  -ldl -lm -lc 
+ifeq ($(TARGET_ARCH),arm)
+  ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -mfloat-abi=softfp -mfpu=vfpv3-d16 -march=armv7-a -D__TARGET_FPU_VFP -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+#    LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -mfloat-abi=softfp -mfpu=vfpv3-d16 -march=armv7-a -D__TARGET_FPU_VFP -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+    FENV := arm/fenv.c
+    LOCAL_LDLIBS := -llog  -ldl -lc
+    LOCAL_STATIC_LIBRARIES := libm6
+  else
+    LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -mfloat-abi=softfp -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+#    LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -mfloat-abi=softfp -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+    FENV :=
+    LOCAL_LDLIBS := -llog  -ldl -lm -lc
+  endif
+endif
+ifeq ($(TARGET_ARCH),mips)
+  LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+#  LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+  FENV := mips/fenv.c
+  LOCAL_LDLIBS := -llog  -ldl -lm -lc
+endif
+ifeq ($(TARGET_ARCH),x86)
+  LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -msse2 -mfpmath=sse -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+#  LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -msse2 -mfpmath=sse -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+  FENV :=
+  LOCAL_LDLIBS := -llog  -ldl -lm -lc
+endif
 
-LOCAL_CFLAGS := -O0  -fno-omit-frame-pointer -fno-strict-aliasing -fno-unwind-tables -fno-tree-vectorize -D_MISALIGN_BYTEVECTOR  -DNOASM  -DOPENJ -fPIC
+LOCAL_CFLAGS += -DSUPPORT_UTF8
+# LOCAL_CFLAGS+= -DSYS_LINUX
 
-
-LOCAL_SRC_FILES :=  a.c ab.c af.c ai.c am.c am1.c amn.c ao.c ap.c ar.c as.c au.c c.c ca.c cc.c cd.c cf.c cg.c ch.c cip.c cl.c cp.c cpdtsp.c cr.c crs.c \
+LOCAL_SRC_FILES := $(FENV) a.c ab.c af.c ai.c am.c am1.c amn.c ao.c ap.c ar.c as.c au.c c.c ca.c cc.c cd.c cf.c cg.c ch.c cip.c cl.c cp.c cpdtsp.c cr.c crs.c \
 	ct.c cu.c cv.c cx.c d.c dc.c dss.c dstop.c dsusp.c dtoa.c f.c f2.c i.c io.c j.c jdlllic.c k.c m.c mbx.c p.c pv.c px.c r.c rl.c rt.c s.c sc.c sl.c \
 	sn.c t.c u.c v.c v0.c v1.c v2.c va1.c va2.c va2s.c vamultsp.c vb.c vbang.c vbit.c vcant.c vchar.c vcat.c vcatsp.c vcomp.c vcompsc.c vd.c vdx.c ve.c \
 	vf.c vfft.c vfrom.c  vfromsp.c vg.c vgauss.c vgcomp.c vgranking.c vgsort.c vgsp.c vi.c viix.c visp.c vm.c vo.c vp.c vq.c vrand.c vrep.c vs.c vsb.c \
 	vt.c vu.c vx.c vz.c w.c wc.c wn.c ws.c x.c x15.c xa.c xb.c xc.c xcrc.c xd.c xf.c xfmt.c xh.c xi.c xl.c xo.c xs.c xt.c xu.c \
-	jconsole.c jeload.c jni/j-jni-interface.c
+	jconsole.c jeload.c jni/j-jni-interface.c jni/jthostne_android.c
+
 
 include $(BUILD_SHARED_LIBRARY)
 
 
-include jni/openj-core/defs/Android.mk
+# uncomment the next line for Android 2.2+
+#include jni/openj-core/defs/Android.mk

Jconsole.mk

@@ -0,0 +1,60 @@
+# This make file can be used to build J as part of an Android project.
+# The project it was created for is hosted on github at
+# https://github.com/mdykman/jconsole_for_android .
+# openj should be checked out into a seperate folder under
+# <project-root>/jni . That project is equipped with an Android.mk
+# file which will invoke this one.
+# Further detais on building J within the Android
+# context can be found in that project
+#
+# this has been built under Android 2.1, API level 7. see note below
+# this has been built under Android 2.2, API level 8.
+
+# TARGET PLATFORMS
+
+# As long as graphics are not a defining goal,
+# Android 2.1 (API 7) has been selected as the
+# target platform to admit the largest possible
+# potential user base.
+# Android 2.2 (API 8) offers a great deal more
+# graphical power to applications with the
+# inclusion of libGLESv2.so and should be the
+# target for future builds hoping to integrate
+# native graphics into the Android app.
+
+# When building under Android API 7 (2.1)
+# hostdefs.c fails to build as that platform
+# lacks regex.h.  Under API 8 (2.2), the
+# include below should be uncommented.
+# The current release for Android 2.1 includes
+# XXX_defs.ijs files generated under API 8.
+# I am confident that these are sufficient
+# for the present build.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := jconsole
+
+LOCAL_LDLIBS := -llog  -ldl -lm -lc
+
+ifeq ($(TARGET_ARCH),arm)
+  ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -mfloat-abi=softfp -mfpu=vfpv3-d16 -march=armv7-a -D__TARGET_FPU_VFP -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+  else
+    LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -mfloat-abi=softfp -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -DREADLINE -fPIC
+  endif
+endif
+ifeq ($(TARGET_ARCH),mips)
+  LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+endif
+ifeq ($(TARGET_ARCH),x86)
+  LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -msse2 -mfpmath=sse -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -DREADLINE -fPIC
+endif
+
+
+LOCAL_SRC_FILES :=  jconsole.c jeload.c linenoise.c
+
+include $(BUILD_EXECUTABLE)
+

Tsdll.mk

@@ -0,0 +1,58 @@
+# This make file can be used to build J as part of an Android project.
+# The project it was created for is hosted on github at
+# https://github.com/mdykman/jconsole_for_android .
+# openj should be checked out into a seperate folder under
+# <project-root>/jni . That project is equipped with an Android.mk
+# file which will invoke this one.
+# Further detais on building J within the Android
+# context can be found in that project
+#
+# this has been built under Android 2.1, API level 7. see note below
+# this has been built under Android 2.2, API level 8.
+
+# TARGET PLATFORMS
+
+# As long as graphics are not a defining goal,
+# Android 2.1 (API 7) has been selected as the
+# target platform to admit the largest possible
+# potential user base.
+# Android 2.2 (API 8) offers a great deal more
+# graphical power to applications with the
+# inclusion of libGLESv2.so and should be the
+# target for future builds hoping to integrate
+# native graphics into the Android app.
+
+# When building under Android API 7 (2.1)
+# hostdefs.c fails to build as that platform
+# lacks regex.h.  Under API 8 (2.2), the
+# include below should be uncommented.
+# The current release for Android 2.1 includes
+# XXX_defs.ijs files generated under API 8.
+# I am confident that these are sufficient
+# for the present build.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := tsdll
+
+LOCAL_LDLIBS := -lc
+
+ifeq ($(TARGET_ARCH),arm)
+  ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -mfloat-abi=softfp -mfpu=vfpv3-d16 -march=armv7-a -D__TARGET_FPU_VFP -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+  else
+    LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -mfloat-abi=softfp -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+  endif
+endif
+ifeq ($(TARGET_ARCH),mips)
+  LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+endif
+ifeq ($(TARGET_ARCH),x86)
+  LOCAL_CFLAGS := -Os -fno-strict-aliasing -fomit-frame-pointer -std=c99 -pedantic -msse2 -mfpmath=sse -D_MISALIGN_BYTEVECTOR -DNOASM -DOPENJ -D_FILE_OFFSET_BITS=64 -fPIC
+endif
+
+LOCAL_SRC_FILES :=  tsdll.c
+
+include $(BUILD_SHARED_LIBRARY)