aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-19 02:32:50 +0100
committerSven Gothel <[email protected]>2012-02-19 02:32:50 +0100
commit9451174b1757675e75db44dc09e2888807f112d9 (patch)
tree3da61dcaffa91ed628f5086c2976e3ebbed2ccbf /make
parent02bdec3dbfac73847518668a070de11a5fb863af (diff)
Fix linux-armv7 crosscompilation
Diffstat (limited to 'make')
-rw-r--r--make/build-test.xml1
-rwxr-xr-xmake/scripts/make.gluegen.all.linux-armv7-cross.sh10
2 files changed, 8 insertions, 3 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index ba21c43..23e47b1 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -243,7 +243,6 @@ export ${system.env.library.path}=${env.TARGET_ROOT}/gluegen/${rootrel.build}/ob
<echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/>
<echo message="${line.separator}
java \${line.separator}
-${jvmDataModel.arg}\${line.separator}
-Djava.library.path=${env.TARGET_ROOT}/gluegen/${rootrel.build}/obj${path.separator}${env.TARGET_ROOT}/gluegen/${rootrel.build}/test/build/natives\${line.separator}
-cp ${junit.run.remote.jars}\${line.separator}
-Dgluegen.root=${gluegen.root} \${line.separator}
diff --git a/make/scripts/make.gluegen.all.linux-armv7-cross.sh b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
index 53fb946..27711c5 100755
--- a/make/scripts/make.gluegen.all.linux-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
@@ -1,5 +1,11 @@
#! /bin/sh
+SDIR=`dirname $0`
+
+if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then
+ . $SDIR/setenv-build-jogl-x86_64.sh
+fi
+
PATH=`pwd`/lib/linux/arm-linux-gnueabi/bin:$PATH
export PATH
@@ -10,8 +16,8 @@ export PATH
# -DisLinuxARMv7=true \
# -DisX11=false \
-export HOST_UID=sven
-export HOST_IP=192.168.0.52
+export HOST_UID=jogamp
+export HOST_IP=jogamp02
export HOST_RSYNC_ROOT=PROJECTS/JOGL
export TARGET_UID=jogamp