diff options
| author | Sven Gothel <[email protected]> | 2011-08-30 14:12:18 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-08-30 14:12:18 +0200 |
| commit | 78b7732498099e1cc6bbedfa7437bb3c8955cfc5 (patch) | |
| tree | f0b20d2811a521a7781042e61713ef38529e589b /make/build-jogl.xml | |
| parent | 0ef3b4a67ba4e287fa7e9407e08838019f6f6cf6 (diff) | |
Proper classpath for all javah commands, using 'rootrel.build'
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 70d471a8d..47511333d 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -218,6 +218,8 @@ <property name="obj.joglsub" value="${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" /> @@ -1392,14 +1394,14 @@ </macrodef> <target name="c.build.jogl.prepare.openMAX" if="setup.addNativeOpenMAX"> - <javah destdir="${src.generated.c.openmax}" classpath="${classes}" class="com.jogamp.openmax.OMXInstance" /> + <javah destdir="${src.generated.c.openmax}" classpath="${javah.classpath}" class="com.jogamp.openmax.OMXInstance" /> </target> <target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX"> - <javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${classes}" class="jogamp.opengl.GLDebugMessageHandler" /> + <javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="jogamp.opengl.GLDebugMessageHandler" /> <!-- Generate the waveout Mixer header --> <!-- FIXME: this is temporary until we move this to another workspace --> - <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /--> + <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="com.jogamp.audio.windows.waveout.Mixer" /--> </target> <target name="c.build.jogl.desktop" unless="setup.noNativeDesktop"> |