11 files changed, 11 insertions, 3 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 317da29..dd7f1cf 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -980,7 +980,7 @@
       <echo message="Linux.armv7" />
       <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.armv7" /> 
       <property name="linker.cfg.id.base"            value="linker.cfg.linux.armv7" /> 
-      <property name="java.lib.dir.platform"         value="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm" />
+      <property name="java.lib.dir.platform"         value="${env.TARGET_JAVA_LIBS}" />
     </target>
 
     <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/libjawt.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/libjawt.so
deleted file mode 100644
index f9e73cd..0000000
--- a/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/libjawt.so
+++ /dev/null
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/server/libjvm.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/server/libjvm.so
deleted file mode 100644
index 49171ad..0000000
--- a/make/lib/arm-linux-gnueabi/ubuntu-11.04/jre/lib/arm/server/libjvm.so
+++ /dev/null
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libX11.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libX11.so
deleted file mode 100644
index 0a56c29..0000000
--- a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libX11.so
+++ /dev/null
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXinerama.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXinerama.so
deleted file mode 100644
index 8c7af7e..0000000
--- a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXinerama.so
+++ /dev/null
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXrandr.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXrandr.so
deleted file mode 100644
index cfcecb8..0000000
--- a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXrandr.so
+++ /dev/null
diff --git a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXxf86vm.so b/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXxf86vm.so
deleted file mode 100644
index b7b5830..0000000
--- a/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib/libXxf86vm.so
+++ /dev/null
diff --git a/make/scripts/crosstest-java-linux-armv7-rel.sh b/make/scripts/crosstest-java-linux-armv7-rel.sh
index f49383a..2b44379 100644
--- a/make/scripts/crosstest-java-linux-armv7-rel.sh
+++ b/make/scripts/crosstest-java-linux-armv7-rel.sh
@@ -6,6 +6,7 @@ export TARGET_UID=jogamp
 export TARGET_IP=beagle01
 export TARGET_ROOT=projects-cross
 
+export ANT_PATH=/usr/share/ant
 export BUILD_DIR=../build-linux-armv7
 
 #TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
@@ -19,7 +20,7 @@ cd $TARGET_ROOT/gluegen/make ;
 LD_LIBRARY_PATH=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
 java \
   -Djava.library.path=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
-  -Djava.class.path=lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
+  -Djava.class.path=lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
   -Djogamp.debug.JNILibLoader=true \
   -Djogamp.debug.NativeLibrary=true \
   -Djogamp.debug.NativeLibrary.Lookup=true \
diff --git a/make/scripts/crosstest-junit-linux-armv7-rel.sh b/make/scripts/crosstest-junit-linux-armv7-rel.sh
index 519824b..6db3b49 100644
--- a/make/scripts/crosstest-junit-linux-armv7-rel.sh
+++ b/make/scripts/crosstest-junit-linux-armv7-rel.sh
@@ -7,6 +7,7 @@ export TARGET_IP=beagle01
 export TARGET_ROOT=projects-cross
 
 export BUILD_DIR=../build-linux-armv7
+export ANT_PATH=/usr/share/ant
 
 TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
 
@@ -18,7 +19,7 @@ cd $TARGET_ROOT/gluegen/make ;
 LD_LIBRARY_PATH=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
 java \
   -Djava.library.path=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
-  -Djava.class.path=lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
+  -Djava.class.path=lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
   -Djogamp.debug.JNILibLoader=true \
   -Djogamp.debug.NativeLibrary=true \
   -Djogamp.debug.NativeLibrary.Lookup=true \
diff --git a/make/scripts/make.gluegen.all.linux-armv7-cross.sh b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
index 1002756..369a497 100755
--- a/make/scripts/make.gluegen.all.linux-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
@@ -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
+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.gluegen.all.linux-armv7.sh b/make/scripts/make.gluegen.all.linux-armv7.sh
index 527347c..2221c10 100755
--- a/make/scripts/make.gluegen.all.linux-armv7.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7.sh
@@ -7,6 +7,9 @@
 #    -DisLinuxX86=true \
 #    -DisX11=true \
 
+export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabi
+export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm
+
 ant \
     -Drootrel.build=build-linux-armv7 \
     -DuseKD=true \