diff options
| author | Sven Gothel <[email protected]> | 2014-06-29 08:36:09 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-06-29 08:36:09 +0200 |
| commit | bd76d3fe74c518b509f86c38f8871bec7f5213a2 (patch) | |
| tree | 8a0a597bc63938d9a22b590a76d03c3bbee59f1e /make/build-jogl.xml | |
| parent | a668ab82817c14c7b29052b1e6f892d19cb074ec (diff) | |
Bug 1027: Fix usage of atomic jar files (NEWT)
Issue was that 'com.jogamp.opengl.util.PNGPixelRect'
was included in jogl-core.jar and that NEWT assumes
PNG conversion is possible having this class available.
However, PNGPixelRect requires 'jogamp.opengl.util.pngj'
which is only included within jogl-util.jar.
Moved PNGPixelRect from jogl-core.jar to jogl-util.jar.
+++
Added manual test launch 'testnoawtatomics' in make/scripts/tests.sh
to test atomic usage.
Works now w/ com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT,
showing that the window/application icon is _not_ set due to not having PNG* available.
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 09ca94ab0..9721f4af9 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -93,7 +93,7 @@ <property name="java.part.core" value="${java.part.gluegen-gl-rt} javax/media/opengl/* javax/media/opengl/fixedfunc/* com/jogamp/opengl/* com/jogamp/opengl/math/** jogamp/opengl/* ${java.part.core.util}"/> - <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace* com/jogamp/opengl/util/AWTAnimatorImpl*"/> + <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace* com/jogamp/opengl/util/AWTAnimatorImpl* com/jogamp/opengl/util/PNG*"/> <property name="java.part.nv-cg" value="com/jogamp/opengl/cg com/jogamp/opengl/cg/* jogamp/opengl/cg/*"/> @@ -153,7 +153,7 @@ value="com/jogamp/opengl/**/swt/**"/> <property name="java.part.util" - value="com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/packrect/** jogamp/opengl/util/av/** jogamp/opengl/util/jpeg/** jogamp/opengl/util/pngj/**"/> + value="com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/packrect/** com/jogamp/opengl/util/PNG* jogamp/opengl/util/av/** jogamp/opengl/util/jpeg/** jogamp/opengl/util/pngj/**"/> <property name="java.part.util.awt" value="com/jogamp/opengl/util/**/awt/**"/> |