From d62aed582bf9c4359527aabfc10e6bb1bda207c4 Mon Sep 17 00:00:00 2001 From: bhgv Date: Fri, 2 Mar 2018 04:05:25 +0200 Subject: ready to build under Linux to Android --- bld.sh | 10 +++++++--- cln.sh | 15 +++++++++++++++ dis/demo/lego/clockreg | 0 dis/demo/ns/runns | 0 dis/demo/odbc/runodbc | 0 dis/demo/spree/spreeclient | 0 dis/demo/whiteboard/runwb | 0 dis/svc/auth | 0 dis/svc/net | 0 dis/svc/registry | 0 dis/svc/rstyx | 0 dis/svc/styx | 0 mkconfig | 4 ++-- mkfile | 8 ++++---- 14 files changed, 28 insertions(+), 9 deletions(-) create mode 100755 cln.sh mode change 100644 => 100755 dis/demo/lego/clockreg mode change 100644 => 100755 dis/demo/ns/runns mode change 100644 => 100755 dis/demo/odbc/runodbc mode change 100644 => 100755 dis/demo/spree/spreeclient mode change 100644 => 100755 dis/demo/whiteboard/runwb mode change 100644 => 100755 dis/svc/auth mode change 100644 => 100755 dis/svc/net mode change 100644 => 100755 dis/svc/registry mode change 100644 => 100755 dis/svc/rstyx mode change 100644 => 100755 dis/svc/styx diff --git a/bld.sh b/bld.sh index 402eb33..8dab3a1 100755 --- a/bld.sh +++ b/bld.sh @@ -1,13 +1,17 @@ #!/bin/sh -export NDK=$(PWD)/../android-ndk-r10e +export NDK=$PWD/../android-ndk-r10e #python %NDK%/build/tools/make_standalone_toolchain.py -v --arch arm --api 17 --install-dir=ndk_toolchain -export ANDR_TOOLCHAIN=$(PWD)/../toolchain +export ANDR_TOOLCHAIN=$PWD/../toolchain #$(NDK)/build/tools/make-standalone-toolchain.sh --platform=android-14 --arch=arm --install-dir=$(ANDR_TOOLCHAIN) --ndk-dir=$(NDK) #--system=windows-x86_64 -export PATH=$(PWD)/Linux/386/bin:$(ANDR_TOOLCHAIN)/bin:$(PATH) +export PATH=$PWD/Linux/386/bin:$ANDR_TOOLCHAIN/bin:$PATH + +export ROOT=$PWD + +ln -s $ANDR_TOOLCHAIN ./ndk_toolchain mk install diff --git a/cln.sh b/cln.sh new file mode 100755 index 0000000..95798d1 --- /dev/null +++ b/cln.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +#export NDK=$PWD/../android-ndk-r10e + +#python %NDK%/build/tools/make_standalone_toolchain.py -v --arch arm --api 17 --install-dir=ndk_toolchain + +export ANDR_TOOLCHAIN=$PWD/../toolchain +#$(NDK)/build/tools/make-standalone-toolchain.sh --platform=android-14 --arch=arm --install-dir=$(ANDR_TOOLCHAIN) --ndk-dir=$(NDK) #--system=windows-x86_64 + +export PATH=$PWD/Linux/386/bin:$ANDR_TOOLCHAIN/bin:$PATH + +export ROOT=$PWD + +mk clean + diff --git a/dis/demo/lego/clockreg b/dis/demo/lego/clockreg old mode 100644 new mode 100755 diff --git a/dis/demo/ns/runns b/dis/demo/ns/runns old mode 100644 new mode 100755 diff --git a/dis/demo/odbc/runodbc b/dis/demo/odbc/runodbc old mode 100644 new mode 100755 diff --git a/dis/demo/spree/spreeclient b/dis/demo/spree/spreeclient old mode 100644 new mode 100755 diff --git a/dis/demo/whiteboard/runwb b/dis/demo/whiteboard/runwb old mode 100644 new mode 100755 diff --git a/dis/svc/auth b/dis/svc/auth old mode 100644 new mode 100755 diff --git a/dis/svc/net b/dis/svc/net old mode 100644 new mode 100755 diff --git a/dis/svc/registry b/dis/svc/registry old mode 100644 new mode 100755 diff --git a/dis/svc/rstyx b/dis/svc/rstyx old mode 100644 new mode 100755 diff --git a/dis/svc/styx b/dis/svc/styx old mode 100644 new mode 100755 diff --git a/mkconfig b/mkconfig index 8db822b..623033c 100644 --- a/mkconfig +++ b/mkconfig @@ -4,7 +4,7 @@ # They are almost always the same. # On Nt systems, the ROOT path MUST be of the form `drive:/path' -ROOT=$PWD +ROOT=$ROOT # # Specify the flavour of Tk (std for standard builds) @@ -14,7 +14,7 @@ TKSTYLE=std # # Except for building kernels, SYSTARG must always be the same as SYSHOST # -SYSHOST=Nt #Plan9 # build system OS type (Hp, Inferno, Irix, Linux, MacOSX, Nt, Plan9, Solaris) +SYSHOST=Linux #Nt #Plan9 # build system OS type (Hp, Inferno, Irix, Linux, MacOSX, Nt, Plan9, Solaris) SYSTARG=Android #Linux #$SYSHOST # target system OS type (Hp, Inferno, Irix, Linux, Nt, Plan9, Solaris) # diff --git a/mkfile b/mkfile index ec9e068..585055e 100644 --- a/mkfile +++ b/mkfile @@ -12,8 +12,8 @@ EMUDIRS=\ libmp\ libsec\ libmath\ - utils/iyacc\ - limbo\ +# utils/iyacc\ +# limbo\ libinterp\ libkeyring\ libdraw\ @@ -24,8 +24,8 @@ EMUDIRS=\ libmemlayer\ libdynld\ liblodepng\ - utils/data2c\ - utils/ndate\ +# utils/data2c\ +# utils/ndate\ emu\ KERNEL_DIRS=\ -- cgit v1.2.3