diff options
| -rw-r--r-- | build.xml | 14 | ||||
| -rwxr-xr-x | scripts/make.jocl.all.android-armv6-cross.sh (renamed from scripts/make.jocl.all.android-armv7-cross.sh) | 6 | ||||
| -rwxr-xr-x | scripts/make.jocl.all.linux-armv6-cross.sh (renamed from scripts/make.jocl.all.linux-armv7-cross.sh) | 12 | ||||
| -rwxr-xr-x | scripts/make.jocl.all.linux-armv6hf-cross.sh | 45 | ||||
| -rw-r--r-- | test/com/jogamp/opencl/gl/CLGLTest.java | 10 |
5 files changed, 62 insertions, 25 deletions
@@ -489,9 +489,9 @@ <syslibset dir="${opencl.lib64.dir}" libs="OpenCL" if="opencl.lib64.dir"/> </linker> - <linker id="linker.cfg.linux.armv7.jocl" extends="linker.cfg.linux.armv7"> - <syslibset dir="/usr/lib" libs="OpenCL" if="static.binding" unless="opencl.libarmv7.dir"/> - <syslibset dir="${opencl.libarmv7.dir}" libs="OpenCL" if="opencl.libarmv7.dir"/> + <linker id="linker.cfg.linux.armv6.jocl" extends="linker.cfg.linux.armv6"> + <syslibset dir="/usr/lib" libs="OpenCL" if="static.binding" unless="opencl.libarmv6.dir"/> + <syslibset dir="${opencl.libarmv6.dir}" libs="OpenCL" if="opencl.libarmv6.dir"/> </linker> <linker id="linker.cfg.win32.mingw.jocl" extends="linker.cfg.win32.mingw"> @@ -514,7 +514,7 @@ <target name="c.configure.default" depends="c.configure.os" /> <target name="c.configure.os" depends="c.configure.win, c.configure.linux, c.configure.macosx, c.configure.solaris" /> <target name="c.configure.win" depends="c.configure.win.mingw32, c.configure.win.mingw64" if="isWindows" /> - <target name="c.configure.linux" depends="c.configure.linux.x86, c.configure.linux.amd64, c.configure.linux.armv7" if="isLinux" /> + <target name="c.configure.linux" depends="c.configure.linux.x86, c.configure.linux.amd64, c.configure.linux.armv6" if="isLinux" /> <target name="c.configure.solaris" depends="c.configure.solaris.x86, c.configure.solaris.sparc, c.configure.solaris.sparcv9, c.configure.solaris.amd64" if="isSolaris" /> <target name="c.configure.win.mingw32" if="isMingW32"> @@ -537,10 +537,10 @@ <property name="compiler.cfg.id" value="${compiler.cfg.id.base}" /> <property name="linker.cfg.id" value="linker.cfg.linux.amd64.jocl" /> </target> - <target name="c.configure.linux.armv7" if="isLinuxARMv7"> - <echo message="Linux.ARMv7" /> + <target name="c.configure.linux.armv6" if="isLinuxARMv6"> + <echo message="Linux.ARMv6" /> <property name="compiler.cfg.id" value="${compiler.cfg.id.base}" /> - <property name="linker.cfg.id" value="linker.cfg.linux.armv7.jocl" /> + <property name="linker.cfg.id" value="linker.cfg.linux.armv6.jocl" /> </target> <target name="c.configure.solaris.x86" if="isSolarisX86"> diff --git a/scripts/make.jocl.all.android-armv7-cross.sh b/scripts/make.jocl.all.android-armv6-cross.sh index 300627f1..db46f5af 100755 --- a/scripts/make.jocl.all.android-armv7-cross.sh +++ b/scripts/make.jocl.all.android-armv6-cross.sh @@ -80,13 +80,13 @@ export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arc # Need to add toolchain bins to the PATH. export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_SDK_HOME/platform-tools:$PATH" -export GLUEGEN_CPPTASKS_FILE=`pwd`/../gluegen/make/lib/gluegen-cpptasks-android-armv7.xml +export GLUEGEN_CPPTASKS_FILE=`pwd`/../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" # BUILD_ARCHIVE=true \ ant \ - -Drootrel.build=build-android-armv7 \ - $* 2>&1 | tee -a make.jocl.all.android-armv7-cross.log + -Drootrel.build=build-android-armv6 \ + $* 2>&1 | tee -a make.jocl.all.android-armv6-cross.log diff --git a/scripts/make.jocl.all.linux-armv7-cross.sh b/scripts/make.jocl.all.linux-armv6-cross.sh index 3dc132b1..cb22530b 100755 --- a/scripts/make.jocl.all.linux-armv7-cross.sh +++ b/scripts/make.jocl.all.linux-armv6-cross.sh @@ -23,22 +23,22 @@ export HOST_IP=jogamp02 export HOST_RSYNC_ROOT=PROJECTS/JOGL export TARGET_UID=jogamp -export TARGET_IP=panda01 +export TARGET_IP=panda02 #export TARGET_IP=jautab02 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 +export TARGET_PLATFORM_LIBS=/opt-linux-armv6-eabi/lib +export TARGET_JAVA_LIBS=/opt-linux-armv6-eabi/jre/lib/arm -export GLUEGEN_CPPTASKS_FILE="../gluegen/make/lib/gluegen-cpptasks-linux-armv4.xml" +export GLUEGEN_CPPTASKS_FILE="../gluegen/make/lib/gluegen-cpptasks-linux-armv6.xml" #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" ant \ - -Drootrel.build=build-linux-armv7 \ - $* 2>&1 | tee make.jocl.all.linux-armv7-cross.log + -Drootrel.build=build-linux-armv6 \ + $* 2>&1 | tee make.jocl.all.linux-armv6-cross.log diff --git a/scripts/make.jocl.all.linux-armv6hf-cross.sh b/scripts/make.jocl.all.linux-armv6hf-cross.sh new file mode 100755 index 00000000..bcb595de --- /dev/null +++ b/scripts/make.jocl.all.linux-armv6hf-cross.sh @@ -0,0 +1,45 @@ +#! /bin/sh + +SDIR=`dirname $0` + +if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +fi + +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 NODE_LABEL=. + +export HOST_UID=jogamp +export HOST_IP=jogamp02 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=panda02 +#export TARGET_IP=jautab02 +export TARGET_ROOT=/home/jogamp/projects-cross +export TARGET_ANT_HOME=/usr/share/ant + +export TARGET_PLATFORM_LIBS=/opt-linux-armv6-armhf/lib +export TARGET_JAVA_LIBS=/opt-linux-armv6-armhf/jre/lib/arm + +export GLUEGEN_CPPTASKS_FILE="../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml" + +#export JUNIT_DISABLED="true" +#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" + +ant \ + -Drootrel.build=build-linux-armv6hf \ + $* 2>&1 | tee make.jocl.all.linux-armv6hf-cross.log + + + + diff --git a/test/com/jogamp/opencl/gl/CLGLTest.java b/test/com/jogamp/opencl/gl/CLGLTest.java index 464f1468..75cd35c2 100644 --- a/test/com/jogamp/opencl/gl/CLGLTest.java +++ b/test/com/jogamp/opencl/gl/CLGLTest.java @@ -74,15 +74,7 @@ public class CLGLTest { private static Window window; public static void initGL() { - GLProfile.initSingleton(true); - - Display display = NewtFactory.createDisplay(null); // local display - assertNotNull(display); - - Screen screen = NewtFactory.createScreen(display, 0); // screen 0 - assertNotNull(screen); - - window = NewtFactory.createWindow(screen, new GLCapabilities(GLProfile.getDefault())); + window = NewtFactory.createWindow(new GLCapabilities(GLProfile.getDefault())); assertNotNull(window); window.setSize(640, 480); |