diff options
| author | Sven Gothel <[email protected]> | 2010-03-29 04:51:18 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-03-29 04:51:18 +0200 |
| commit | b3f2ab84401efef233c0038f004a9f210cbe83fc (patch) | |
| tree | 6741a098981c0742e148ce5587aff35d0a776250 /make/build-jogl.xml | |
| parent | 49b145b3fb10b2dd070615c60613d69ca44d4548 (diff) | |
| parent | 2d57c25287542dcbad59c6b4782e87f86bd0fbc6 (diff) | |
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index c3bc96bd8..4a0bac4d5 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -191,10 +191,10 @@ </condition> <property name="java.excludes.javadoc.packagenames" - value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.javafx.audio.windows.waveout.TestSpatialization"/> + value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/> <property name="java.excludes.fixme" - value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java" /> + value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" /> <property name="java.excludes.cdcfp" value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/jogamp/opengl/util/TGAWriter.java"/> @@ -1590,7 +1590,7 @@ <target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX"> <!-- Generate the waveout Mixer header --> <!-- FIXME: this is temporary until we move this to another workspace --> - <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.javafx.audio.windows.waveout.Mixer" /--> + <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /--> </target> <target name="c.build.jogl.gl2" unless="setup.nodesktop"> @@ -1826,7 +1826,7 @@ <include name="com/jogamp/opengl/**" /> <include name="${java.part.openmax}" /> <!-- FIXME: this is temporary until we move these classes to another workspace --> - <include name="com/jogamp/javafx/**" /> + <include name="com/jogamp/**" /> </fileset> <fileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode}"/> @@ -1835,7 +1835,7 @@ <target name="build-jars-all-noawt" depends="setup-manifestfile"> <jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true"> <fileset dir="${classes}" - includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/javafx/**" + includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/**" excludes="${java.part.awt} ${java.part.util.awt}"> </fileset> <fileset dir="${src.java}" |