diff options
Diffstat (limited to 'make')
21 files changed, 23 insertions, 14 deletions
diff --git a/make/lib/gluegen-cpptasks-linux-armv6hf.xml b/make/lib/gluegen-cpptasks-linux-armv6hf.xml index ed0b981..364d26a 100644 --- a/make/lib/gluegen-cpptasks-linux-armv6hf.xml +++ b/make/lib/gluegen-cpptasks-linux-armv6hf.xml @@ -44,7 +44,7 @@ <compilerarg value="-fpic" /> <compilerarg value="-march=armv6" /> <compilerarg value="-marm" /> - <!-- compilerarg value="-mfloat-abi=hard" / --> + <compilerarg value="-mfloat-abi=hard" /> </compiler> <linker id="linker.cfg.linux.armv6" name="gcc"> diff --git a/make/lib/linux/arm-linux-gnueabi/bin/gcc b/make/lib/linux/arm-linux-gnueabi/bin/gcc deleted file mode 120000 index edeaa99..0000000 --- a/make/lib/linux/arm-linux-gnueabi/bin/gcc +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/arm-linux-gnueabi-gcc
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabi/bin/ld b/make/lib/linux/arm-linux-gnueabi/bin/ld deleted file mode 120000 index 68f4fae..0000000 --- a/make/lib/linux/arm-linux-gnueabi/bin/ld +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/arm-linux-gnueabi-ld
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabi/bin/objdump b/make/lib/linux/arm-linux-gnueabi/bin/objdump deleted file mode 120000 index a48d9ee..0000000 --- a/make/lib/linux/arm-linux-gnueabi/bin/objdump +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/arm-linux-gnueabi-objdump
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabi/bin/strip b/make/lib/linux/arm-linux-gnueabi/bin/strip deleted file mode 120000 index 8dab56b..0000000 --- a/make/lib/linux/arm-linux-gnueabi/bin/strip +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/arm-linux-gnueabi-strip
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/gcc b/make/lib/linux/arm-linux-gnueabihf/bin/gcc deleted file mode 120000 index dca59c0..0000000 --- a/make/lib/linux/arm-linux-gnueabihf/bin/gcc +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/arm-linux-gnueabihf-gcc
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/ld b/make/lib/linux/arm-linux-gnueabihf/bin/ld deleted file mode 120000 index bce9f7f..0000000 --- a/make/lib/linux/arm-linux-gnueabihf/bin/ld +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/arm-linux-gnueabihf-ld
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/objdump b/make/lib/linux/arm-linux-gnueabihf/bin/objdump deleted file mode 120000 index ded739c..0000000 --- a/make/lib/linux/arm-linux-gnueabihf/bin/objdump +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/arm-linux-gnueabihf-objdump
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/strip b/make/lib/linux/arm-linux-gnueabihf/bin/strip deleted file mode 120000 index c941465..0000000 --- a/make/lib/linux/arm-linux-gnueabihf/bin/strip +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/arm-linux-gnueabihf-strip
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/gcc b/make/lib/toolchain/armhf-linux-gnueabi/bin/gcc new file mode 120000 index 0000000..ad74056 --- /dev/null +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/gcc @@ -0,0 +1 @@ +/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-gcc
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/ld b/make/lib/toolchain/armhf-linux-gnueabi/bin/ld new file mode 120000 index 0000000..6d1bd13 --- /dev/null +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/ld @@ -0,0 +1 @@ +/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-ld
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/objdump b/make/lib/toolchain/armhf-linux-gnueabi/bin/objdump new file mode 120000 index 0000000..9502840 --- /dev/null +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/objdump @@ -0,0 +1 @@ +/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-objdump
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/strip b/make/lib/toolchain/armhf-linux-gnueabi/bin/strip new file mode 120000 index 0000000..a4ce508 --- /dev/null +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/strip @@ -0,0 +1 @@ +/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-strip
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/gcc b/make/lib/toolchain/armsf-linux-gnueabi/bin/gcc new file mode 120000 index 0000000..171bfb6 --- /dev/null +++ b/make/lib/toolchain/armsf-linux-gnueabi/bin/gcc @@ -0,0 +1 @@ +/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-gcc
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/ld b/make/lib/toolchain/armsf-linux-gnueabi/bin/ld new file mode 120000 index 0000000..f10f5b8 --- /dev/null +++ b/make/lib/toolchain/armsf-linux-gnueabi/bin/ld @@ -0,0 +1 @@ +/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-ld
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/objdump b/make/lib/toolchain/armsf-linux-gnueabi/bin/objdump new file mode 120000 index 0000000..8e28b95 --- /dev/null +++ b/make/lib/toolchain/armsf-linux-gnueabi/bin/objdump @@ -0,0 +1 @@ +/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-objdump
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/strip b/make/lib/toolchain/armsf-linux-gnueabi/bin/strip new file mode 120000 index 0000000..1e5fe91 --- /dev/null +++ b/make/lib/toolchain/armsf-linux-gnueabi/bin/strip @@ -0,0 +1 @@ +/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-strip
\ No newline at end of file diff --git a/make/scripts/make.gluegen.all.linux-armv6-cross.sh b/make/scripts/make.gluegen.all.linux-armv6-cross.sh index bd56e89..7c1dee4 100755 --- a/make/scripts/make.gluegen.all.linux-armv6-cross.sh +++ b/make/scripts/make.gluegen.all.linux-armv6-cross.sh @@ -7,7 +7,7 @@ if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then fi # arm-linux-gnueabi == armel triplet -PATH=`pwd`/lib/linux/arm-linux-gnueabi/bin:$PATH +PATH=`pwd`/lib/toolchain/armsf-linux-gnueabi/bin:$PATH export PATH # -Dc.compiler.debug=true diff --git a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh index c8c8f14..331a97b 100755 --- a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh +++ b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh @@ -7,7 +7,7 @@ if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then fi # arm-linux-gnueabihf == armhf triplet -PATH=`pwd`/lib/linux/arm-linux-gnueabihf/bin:$PATH +PATH=`pwd`/lib/toolchain/armhf-linux-gnueabi/bin:$PATH export PATH # -Dc.compiler.debug=true diff --git a/make/scripts/make.gluegen.all.sh b/make/scripts/make.gluegen.all.sh new file mode 100755 index 0000000..ec97d04 --- /dev/null +++ b/make/scripts/make.gluegen.all.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +SDIR=`dirname $0` + +$SDIR/make.gluegen.all.linux-armv6-cross.sh \ +&& $SDIR/make.gluegen.all.linux-armv6hf-cross.sh \ +&& $SDIR/make.gluegen.all.linux-x86_64.sh \ +&& $SDIR/make.gluegen.all.linux-x86.sh \ +&& $SDIR/make.gluegen.all.android-armv6-cross.sh \ diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index f38d179..769a034 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -73,7 +73,7 @@ function onetest() { echo } # -#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG @@ -93,9 +93,9 @@ function onetest() { #onetest com.jogamp.gluegen.PCPPTest 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG -#onetest com.jogamp.common.os.TestElfReader01 2>&1 | tee -a $LOG +onetest com.jogamp.common.os.TestElfReader01 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG -onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG +#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG |