diff options
| author | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
| commit | 69fe372b874d913e2d1c27f1d103e1fced668ecf (patch) | |
| tree | cf402337903ba3d02bbab628f2f82a23908a5f11 /make | |
| parent | 2138fc787c1e497be7f373aa68b3f751c955008f (diff) | |
| parent | 2d76c16b9384d383d3e6a9d7cb727f2591a39228 (diff) | |
Resolved conflicts
Diffstat (limited to 'make')
| -rw-r--r-- | make/runtest-cvm.bat | 4 | ||||
| -rw-r--r-- | make/runtest-cvm.sh | 8 | ||||
| -rw-r--r-- | make/runtest.sh | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/make/runtest-cvm.bat b/make/runtest-cvm.bat index 8178032..c0747d2 100644 --- a/make/runtest-cvm.bat +++ b/make/runtest-cvm.bat @@ -3,6 +3,6 @@ set CVM_HOME=c:\cvm set JAR_DIR=jogl\lib set LIB_DIR=jogl\lib -%CVM_HOME%\bin\cvm "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:gluegen\classes-cdc" com.sun.gluegen.test.TestPointerBufferEndian -%CVM_HOME%\bin\cvm "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:gluegen\classes-cdc" com.sun.gluegen.test.TestStructAccessorEndian +%CVM_HOME%\bin\cvm "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:gluegen\classes-cdc" com.jogamp.gluegen.test.TestPointerBufferEndian +%CVM_HOME%\bin\cvm "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:gluegen\classes-cdc" com.jogamp.gluegen.test.TestStructAccessorEndian diff --git a/make/runtest-cvm.sh b/make/runtest-cvm.sh index 268cf6e..0b29c07 100644 --- a/make/runtest-cvm.sh +++ b/make/runtest-cvm.sh @@ -11,9 +11,9 @@ if [ ! -x "$CVM" -o -z "$builddir" ] ; then exit 1 fi -echo com.sun.gluegen.test.TestPointerBufferEndian -$CVM -Dsun.boot.library.path=$builddir/obj -Xbootclasspath/a:$builddir/classes-cdc com.sun.gluegen.test.TestPointerBufferEndian +echo com.jogamp.gluegen.test.TestPointerBufferEndian +$CVM -Dsun.boot.library.path=$builddir/obj -Xbootclasspath/a:$builddir/classes-cdc com.jogamp.gluegen.test.TestPointerBufferEndian echo -echo com.sun.gluegen.test.TestStructAccessorEndian -$CVM -Dsun.boot.library.path=$builddir/obj -Xbootclasspath/a:$builddir/classes-cdc com.sun.gluegen.test.TestStructAccessorEndian +echo com.jogamp.gluegen.test.TestStructAccessorEndian +$CVM -Dsun.boot.library.path=$builddir/obj -Xbootclasspath/a:$builddir/classes-cdc com.jogamp.gluegen.test.TestStructAccessorEndian echo diff --git a/make/runtest.sh b/make/runtest.sh index 8001c82..427f4f3 100644 --- a/make/runtest.sh +++ b/make/runtest.sh @@ -8,9 +8,9 @@ if [ -z "$builddir" ] ; then exit 1 fi -echo com.sun.gluegen.test.TestPointerBufferEndian -java -Djava.library.path=$builddir/obj -classpath $builddir/classes com.sun.gluegen.test.TestPointerBufferEndian +echo com.jogamp.gluegen.test.TestPointerBufferEndian +java -Djava.library.path=$builddir/obj -classpath $builddir/classes com.jogamp.gluegen.test.TestPointerBufferEndian echo -echo com.sun.gluegen.test.TestStructAccessorEndian -java -Djava.library.path=$builddir/obj -classpath $builddir/classes com.sun.gluegen.test.TestStructAccessorEndian +echo com.jogamp.gluegen.test.TestStructAccessorEndian +java -Djava.library.path=$builddir/obj -classpath $builddir/classes com.jogamp.gluegen.test.TestStructAccessorEndian echo |