diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 64 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 3 | ||||
| -rw-r--r-- | make/build-newt.xml | 150 | ||||
| -rw-r--r-- | make/build-oculusvr.xml | 2 | ||||
| -rw-r--r-- | make/build-staticglgen.xml | 10 | ||||
| -rw-r--r-- | make/build-test.xml | 5 |
6 files changed, 201 insertions, 33 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index db80c298c..363ef8e42 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -249,8 +249,6 @@ <property name="rootrel.obj.joglsub" value="${rootrel.obj.jogl}/jogl"/> <property name="obj.cgsub" value="${obj.jogl}/cg" /> - <property name="javah.classpath" value="${gluegen-rt.jar}:${build.nativewindow}/classes:${classes}" /> - <!-- The GL headers from which Java files are generated --> <property name="stub.includes.opengl" value="${stub.includes}/opengl" /> @@ -800,8 +798,7 @@ memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" - target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" + target="${target.targetlevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="gluegen-gl.classpath"/> <src path="${src.java}" /> @@ -815,7 +812,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="gluegen-gl.classpath"/> <src path="${src.java}" /> @@ -1079,6 +1075,56 @@ - will be generated. --> <target name="java.compile.firstpass" depends="java.generate,java.generate.cg"> + <!-- generate JOGL native headers --> + <javac srcdir="${src.java}:${src.generated.java}" + destdir="${classes}" + nativeheaderdir="${build.jogl}/gensrc/native/jogl" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="nativewindow_gluegen.classpath"/> + <include name="jogamp/opengl/GLDebugMessageHandler.java" /> + <include name="jogamp/opengl/GLContextImpl.java" /> + </javac> + + <!-- generate libav native headers --> + <javac srcdir="${src.java}:${src.generated.java}" + destdir="${classes}" + nativeheaderdir="${src.generated.c.libav}" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="nativewindow_gluegen.classpath"/> + <include name="jogamp/opengl/util/av/impl/FFMPEGStaticNatives.java" /> + <include name="jogamp/opengl/util/av/impl/FFMPEGv08Natives.java" /> + <include name="jogamp/opengl/util/av/impl/FFMPEGv09Natives.java" /> + <include name="jogamp/opengl/util/av/impl/FFMPEGv10Natives.java" /> + <include name="jogamp/opengl/util/av/impl/FFMPEGv11Natives.java" /> + </javac> + + <!-- generate openmax native headers --> + <javac srcdir="${src.java}:${src.generated.java}" + destdir="${classes}" + nativeheaderdir="${src.generated.c.openmax}" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="nativewindow_gluegen.classpath"/> + <include name="jogamp/opengl/util/av/impl/OMXGLMediaPlayer.java" /> + </javac> + <!-- Perform the first pass Java compile. --> <javac destdir="${classes}" includes="com/jogamp/opengl/fixedfunc/** com/jogamp/opengl/GLDrawableFactory.java com/jogamp/opengl/GLDrawable.java com/jogamp/opengl/GLContext.java com/jogamp/opengl/GL.java com/jogamp/opengl/GL2ES1.java com/jogamp/opengl/GLES1.java com/jogamp/opengl/GL2ES2.java com/jogamp/opengl/GLES2.java com/jogamp/opengl/GL2ES3.java com/jogamp/opengl/GL2GL3.java com/jogamp/opengl/GL2.java com/jogamp/opengl/GL3ES3.java com/jogamp/opengl/GL3.java com/jogamp/opengl/GL3bc.java com/jogamp/opengl/GL4ES3.java com/jogamp/opengl/GLES3.java com/jogamp/opengl/GL4.java com/jogamp/opengl/GL4bc.java" @@ -1088,7 +1134,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath"/> <src path="${src.java}" /> @@ -1106,7 +1151,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen_joal.classpath"/> <src path="${src.java}" /> @@ -1124,7 +1168,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath"/> <src path="${src.java}" /> @@ -1142,7 +1185,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen_android.classpath"/> <src path="${src.java}" /> @@ -1163,7 +1205,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath"/> <src path="${src.java}" /> @@ -1709,9 +1750,6 @@ </macrodef> <target name="c.build.jogl.prepare"> - <javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="jogamp.opengl.GLDebugMessageHandler, jogamp.opengl.GLContextImpl" /> - <javah destdir="${src.generated.c.libav}" classpath="${javah.classpath}" class="jogamp.opengl.util.av.impl.FFMPEGStaticNatives,jogamp.opengl.util.av.impl.FFMPEGv08Natives,jogamp.opengl.util.av.impl.FFMPEGv09Natives,jogamp.opengl.util.av.impl.FFMPEGv10Natives,jogamp.opengl.util.av.impl.FFMPEGv11Natives" /> - <javah destdir="${src.generated.c.openmax}" classpath="${javah.classpath}" class="jogamp.opengl.util.av.impl.OMXGLMediaPlayer" /> <!-- Generate the waveout Mixer header --> <!-- FIXME: this is temporary until we move this to another workspace --> <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="com.jogamp.audio.windows.waveout.Mixer" /--> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 181d89196..bbff2c9cb 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -122,8 +122,6 @@ <!-- The compiler output directories. --> <property name="classes" value="${build.nativewindow}/classes" /> - <property name="javah.classpath" value="${gluegen-rt.jar}:${classes}" /> - <!-- The headers from which Java files are generated --> <dirset id="stub.includes.fileset.all" dir="."> <include name="${stub.includes}/macosx/**" /> @@ -407,7 +405,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="swt_gluegen.classpath"/> <src path="${src.java}" /> diff --git a/make/build-newt.xml b/make/build-newt.xml index 6c475be81..ef4fcd2ab 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -205,8 +205,6 @@ <!-- The compiler output directories. --> <property name="classes" value="${build.newt}/classes" /> - <property name="javah.classpath" value="${gluegen-rt.jar}:${build.nativewindow}/classes:${classes}" /> - <!-- The javadoc dirs. --> <property name="javadoc" value="${project.root}/javadoc_newt_public" /> <property name="javadoc.spec" value="${project.root}/javadoc_newt_spec" /> @@ -246,6 +244,131 @@ - Compile the original and generated source. --> <target name="java.compile.javase"> + + <!-- create KD native headers --> + <javac srcdir="${src.java}" + destdir="${classes}" + excludes="${java.excludes.all} ${java.part.driver.android}" + nativeheaderdir="${src.generated.c}/KD" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="jogl_nativewindow_gluegen.classpath"/> + <include name="jogamp/newt/driver/kd/WindowDriver.java" /> + </javac> + + <!-- create Intel GDL native headers --> + <javac srcdir="${src.java}" + destdir="${classes}" + excludes="${java.excludes.all} ${java.part.driver.android}" + nativeheaderdir="${src.generated.c}/IntelGDL" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="jogl_nativewindow_gluegen.classpath"/> + <include name="jogamp/newt/driver/intel/gdl/DisplayDriver.java" /> + <include name="jogamp/newt/driver/intel/gdl/ScreenDriver.java" /> + <include name="jogamp/newt/driver/intel/gdl/WindowDriver.java" /> + </javac> + + <!-- create Broadcom EGL native headers --> + <javac srcdir="${src.java}" + destdir="${classes}" + excludes="${java.excludes.all} ${java.part.driver.android}" + nativeheaderdir="${src.generated.c}/bcm/egl" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="jogl_nativewindow_gluegen.classpath"/> + <include name="jogamp/newt/driver/bcm/egl/WindowDriver.java" /> + </javac> + + <!-- create Broadcom VideoCore IV native headers --> + <javac srcdir="${src.java}" + destdir="${classes}" + excludes="${java.excludes.all} ${java.part.driver.android}" + nativeheaderdir="${src.generated.c}/bcm/vc/iv" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="jogl_nativewindow_gluegen.classpath"/> + <include name="jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java" /> + <include name="jogamp/newt/driver/bcm/vc/iv/ScreenDriver.java" /> + <include name="jogamp/newt/driver/bcm/vc/iv/WindowDriver.java" /> + </javac> + + <!-- create Windows native headers --> + <javac srcdir="${src.java}" + destdir="${classes}" + excludes="${java.excludes.all} ${java.part.driver.android}" + nativeheaderdir="${src.generated.c}/Windows" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="jogl_nativewindow_gluegen.classpath"/> + <include name="jogamp/newt/driver/windows/WindowDriver.java" /> + <include name="jogamp/newt/driver/windows/ScreenDriver.java" /> + <include name="jogamp/newt/driver/windows/DisplayDriver.java" /> + </javac> + + <!-- create OSX native headers --> + <javac srcdir="${src.java}" + destdir="${classes}" + excludes="${java.excludes.all} ${java.part.driver.android}" + nativeheaderdir="${src.generated.c}/MacOSX" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="jogl_nativewindow_gluegen.classpath"/> + <include name="jogamp/newt/driver/macosx/WindowDriver.java" /> + <include name="jogamp/newt/driver/macosx/ScreenDriver.java" /> + <include name="jogamp/newt/driver/macosx/DisplayDriver.java" /> + </javac> + + <!-- create X11 native headers --> + <javac srcdir="${src.java}" + destdir="${classes}" + excludes="${java.excludes.all} ${java.part.driver.android}" + nativeheaderdir="${src.generated.c}/X11" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="jogl_nativewindow_gluegen.classpath"/> + <include name="jogamp/newt/driver/x11/WindowDriver.java" /> + <include name="jogamp/newt/driver/x11/ScreenDriver.java" /> + <include name="jogamp/newt/driver/x11/DisplayDriver.java" /> + <include name="jogamp/newt/driver/x11/RandR11.java" /> + <include name="jogamp/newt/driver/x11/RandR13.java" /> + </javac> + <javac destdir="${classes}" excludes="${java.excludes.all} ${java.part.driver.android}" fork="yes" @@ -254,7 +377,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> <classpath refid="jogl_nativewindow_gluegen.classpath"/> @@ -262,6 +384,23 @@ </target> <target name="java.compile.android" if="android-jars.available"> + + <!-- create Android native headers --> + <javac srcdir="${src.java}" + destdir="${classes}" + excludes="${java.excludes.all}" + nativeheaderdir="${src.generated.c}/Android" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="jogl_nativewindow_gluegen_android.classpath"/> + <include name="jogamp/newt/driver/android/WindowDriver.java" /> + </javac> + <javac destdir="${classes}" excludes="${java.excludes.all}" fork="yes" @@ -270,7 +409,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> <classpath refid="jogl_nativewindow_gluegen_android.classpath"/> @@ -776,6 +914,7 @@ </sequential> </macrodef> + <!-- Removed: To be edited <target name="c.build.newt.prepare"> <javah destdir="${src.generated.c}/KD" classpath="${javah.classpath}" class="jogamp.newt.driver.kd.WindowDriver" /> @@ -793,6 +932,7 @@ <target name="c.build.newt.prepare.android" if="isAndroid"> <javah destdir="${src.generated.c}/Android" classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.WindowDriver" /> </target> + --> <target name="c.build.newt.windowlib" unless="setup.nonatives"> <c.build c.compiler.src.files="c.src.files.newt" @@ -809,7 +949,7 @@ <target name="c.build.newt.natives" depends="c.build.newt.windowlib" unless="setup.nonatives"> </target> - <target name="c.build.newt" depends="c.configure,c.build.newt.prepare,c.build.newt.prepare.android,c.build.newt.natives"> + <target name="c.build.newt" depends="c.configure,c.build.newt.natives"> <antcall target="c.manifest" inheritRefs="true" /> </target> diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml index 2fa7b16fa..b8dda8413 100644 --- a/make/build-oculusvr.xml +++ b/make/build-oculusvr.xml @@ -191,7 +191,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath"/> <src path="${src.java}" /> @@ -206,7 +205,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="jogl_nativewindow_gluegen.classpath"/> <src path="${src.java}" /> diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml index 8256fb00e..69785abee 100644 --- a/make/build-staticglgen.xml +++ b/make/build-staticglgen.xml @@ -29,13 +29,12 @@ <mkdir dir="${classes}" /> <!-- Compile BuildStaticGLInfo --> - <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}" + <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" debug="true" debuglevel="${javacdebuglevel}" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" - target="${target.targetlevel}" - bootclasspath="${target.rt.jar}"> + target="${target.targetlevel}"> <classpath refid="antlr.classpath" /> </javac> @@ -55,13 +54,12 @@ <!-- Build the BuildStaticGLInfo ANT task. - NOTE: ONLY the StaticGLGen is built at this time. BuildStaticGLInfo - itself is built in a separate task. --> - <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}" + <javac destdir="${classes}" includes="**/StaticGLGenTask.java" debug="true" debuglevel="${javacdebuglevel}" includeAntRuntime="true" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" - target="${target.targetlevel}" - bootclasspath="${target.rt.jar}"> + target="${target.targetlevel}"> <src path="${src.java}" /> <classpath refid="classpath" /> </javac> diff --git a/make/build-test.xml b/make/build-test.xml index 320a1d37d..df25c5a09 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -115,7 +115,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="junit_jogl_newt.compile.classpath"/> <src path="${src.test}" /> @@ -131,7 +130,6 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="junit_jogl_newt_oculusvr.compile.classpath"/> <src path="${src.test}" /> @@ -171,8 +169,7 @@ memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" - target="${target.targetlevel}" - bootclasspath="${target.rt.jar}" + target="${target.targetlevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="junit_jogl_newt_android.compile.classpath"/> <src path="${src.test}" /> |