summaryrefslogtreecommitdiffstats
path: root/make/scripts
diff options
context:
space:
mode:
authorRami Santina <[email protected]>2011-08-02 15:36:43 +0300
committerRami Santina <[email protected]>2011-08-02 15:36:43 +0300
commit6508b1bd4bdc1bb7ef71bfeb96052fae67a2f425 (patch)
tree0c72674bfd0413938c0a1ada32ed34b9b51a6d3c /make/scripts
parentbbbf51acf183b6fe696afd009d0ae49f6745bc40 (diff)
parentae51b15c98af2ce462cb8ff1a237dd0c51e78e80 (diff)
merge with sgothel multitouch
Diffstat (limited to 'make/scripts')
-rwxr-xr-xmake/scripts/make.jogl.all.linux-armv7-cross.sh5
-rwxr-xr-xmake/scripts/make.jogl.all.linux-armv7.sh15
2 files changed, 4 insertions, 16 deletions
diff --git a/make/scripts/make.jogl.all.linux-armv7-cross.sh b/make/scripts/make.jogl.all.linux-armv7-cross.sh
index 2828d357b..bbde79949 100755
--- a/make/scripts/make.jogl.all.linux-armv7-cross.sh
+++ b/make/scripts/make.jogl.all.linux-armv7-cross.sh
@@ -1,6 +1,6 @@
#! /bin/sh
-PATH=`pwd`/../../gluegen/make/lib/linux-x86_64/arm-linux-gnueabi/bin:$PATH
+PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabi/bin:$PATH
export PATH
# -Dc.compiler.debug=true
@@ -19,6 +19,9 @@ export TARGET_IP=beagle01
export TARGET_ROOT=/home/jogamp/projects-cross
export TARGET_ANT_HOME=/usr/share/ant
+export TARGET_PLATFORM_LIBS=/opt-linux-armv7-eabi/lib
+export TARGET_JAVA_LIBS=/opt-linux-armv7-eabi/jre/lib/arm
+
ant \
-Drootrel.build=build-linux-armv7 \
-Dgluegen.cpptasks.detected.os=true \
diff --git a/make/scripts/make.jogl.all.linux-armv7.sh b/make/scripts/make.jogl.all.linux-armv7.sh
deleted file mode 100755
index fd4e95b30..000000000
--- a/make/scripts/make.jogl.all.linux-armv7.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-# -Dc.compiler.debug=true
-# -Dgluegen.cpptasks.detected.os=true \
-# -DisUnix=true \
-# -DisLinux=true \
-# -DisLinuxX86=true \
-# -DisX11=true \
-
-ant \
- -Drootrel.build=build-linux-armv7 \
- -DuseKD=true \
- -DuseOpenMAX=true \
- -DuseBroadcomEGL=true \
- $* 2>&1 | tee make.jogl.all.linux-armv7.log