diff options
| author | Mark Raynsford <[email protected]> | 2014-06-30 12:45:53 +0000 |
|---|---|---|
| committer | Mark Raynsford <[email protected]> | 2014-06-30 12:45:53 +0000 |
| commit | 5951b33b303df3a12888fe0fbc5ccc88112a3984 (patch) | |
| tree | 4130f031a7dd8195420f5874f2a0cec7d74aa8b0 /make/scripts | |
| parent | 6611735d544a2e09d56213dbfff4a1cd8a029529 (diff) | |
Attempt to remove aliasing from native libraries.
Renamed:
jogl-core.jar → jogl.jar
nativewindow-core.jar → nativewindow.jar
The build scripts have been edited to produce sets of natives for
each "module" (as opposed to producing one set of natives and then
have each module point to them via aliasing).
Bug: 1023
Bug: 1024
Depends on 46faa59d439ef235d7691fc64d56eedc600ffa1a from gluegen.
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/lstjars.sh | 4 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh index 2cb4e1b56..d515013b0 100755 --- a/make/scripts/lstjars.sh +++ b/make/scripts/lstjars.sh @@ -45,7 +45,7 @@ function listdeployment() { echo echo JOGL Min X11 Min egl es1 es2 - report gluegen-rt.$JAR_SUFFIX atomic/jogl-core.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow-core.$JAR_SUFFIX atomic/newt-core.$JAR_SUFFIX atomic/nativewindow-os-x11.$JAR_SUFFIX atomic/newt-driver-x11.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz libnativewindow_x11.so.gz libnewt.so.gz + report gluegen-rt.$JAR_SUFFIX atomic/jogl.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow.$JAR_SUFFIX atomic/newt.$JAR_SUFFIX atomic/nativewindow-os-x11.$JAR_SUFFIX atomic/newt-driver-x11.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz libnativewindow_x11.so.gz libnewt.so.gz echo echo JOGL Android - mobile egl es1 es2 @@ -53,7 +53,7 @@ function listdeployment() { echo echo JOGL Min Android/Mobile Min egl es1 es2 - report gluegen-rt-android.$JAR_SUFFIX atomic/jogl-core.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-os-android.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow-core.$JAR_SUFFIX atomic/newt-core.$JAR_SUFFIX atomic/newt-driver-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz + report gluegen-rt-android.$JAR_SUFFIX atomic/jogl.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-os-android.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow.$JAR_SUFFIX atomic/newt.$JAR_SUFFIX atomic/newt-driver-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz echo } diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index aa06046df..173f397af 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -290,7 +290,7 @@ function jrun() { #export USE_CLASSPATH=$JOGAMP_MOBILE_CLASSPATH #export USE_CLASSPATH=$JOGAMP_ALL_NOAWT_ALT_CLASSPATH #export USE_CLASSPATH=$JOGAMP_MOBILE_ALT_CLASSPATH - #export USE_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILD_DIR/jar/atomic/jogl-core.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-gldesktop.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-util.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-core.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-core.jar:$JOGL_BUILD_DIR/jar/atomic/newt-driver-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-ogl.jar:$JOGL_BUILD_DIR/jar/jogl-test.jar:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS + #export USE_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILD_DIR/jar/atomic/jogl.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-gldesktop.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-util.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt.jar:$JOGL_BUILD_DIR/jar/atomic/newt-driver-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-ogl.jar:$JOGL_BUILD_DIR/jar/jogl-test.jar:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS X_ARGS="-Djava.awt.headless=true $X_ARGS" fi if [ $swton -eq 1 ] ; then |