From 6e4051d8c9faeec003b15b68bd01e3caf22869fb Mon Sep 17 00:00:00 2001 From: Xerxes Rånby Date: Mon, 6 Aug 2012 21:00:19 +0000 Subject: Use armv6 optimization for armhf to stay compatible with the new Raspberry Pi Raspbian distribution. --- make/scripts/make.jogl.all.linux-armv7hf-cross.sh | 2 +- make/scripts/make.jogl.all.linux-armv7hf.sh | 27 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100755 make/scripts/make.jogl.all.linux-armv7hf.sh diff --git a/make/scripts/make.jogl.all.linux-armv7hf-cross.sh b/make/scripts/make.jogl.all.linux-armv7hf-cross.sh index cd82d82af..b51fe94a9 100755 --- a/make/scripts/make.jogl.all.linux-armv7hf-cross.sh +++ b/make/scripts/make.jogl.all.linux-armv7hf-cross.sh @@ -33,7 +33,7 @@ export TARGET_PLATFORM_ROOT=/opt-linux-armv7-armhf export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm -export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv7hf.xml" +export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml" #export JUNIT_DISABLED="true" export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" diff --git a/make/scripts/make.jogl.all.linux-armv7hf.sh b/make/scripts/make.jogl.all.linux-armv7hf.sh new file mode 100755 index 000000000..a94b05824 --- /dev/null +++ b/make/scripts/make.jogl.all.linux-armv7hf.sh @@ -0,0 +1,27 @@ +#! /bin/sh + +# arm-linux-gnueabihf == armhf triplet +PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH +export PATH + +# -Dc.compiler.debug=true +# -Dgluegen.cpptasks.detected.os=true \ +# -DisUnix=true \ +# -DisLinux=true \ +# -DisLinuxARMv7=true \ +# -DisX11=false \ + +export TARGET_PLATFORM_ROOT=/ +export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf +export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm + +export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml" + +ant \ + -Drootrel.build=build-linux-armv7hf \ + -Dsetup.addNativeKD=true \ + -Dsetup.addNativeOpenMAX=true \ + -Dsetup.addNativeBroadcomEGL=true \ + -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \ + $* 2>&1 | tee make.jogl.all.linux-armv7hf.log + -- cgit v1.2.3