diff options
| author | Wade Walker <[email protected]> | 2011-08-25 20:59:32 -0500 |
|---|---|---|
| committer | Wade Walker <[email protected]> | 2011-08-25 20:59:32 -0500 |
| commit | cd31c4f0dc7a5f5595e0ca2f0e815d3814ebd94e (patch) | |
| tree | 7f0395665ec64224a4fa9a8aa6541b6a32244862 | |
| parent | 5047b00127d976281098c39bee2d211fdbda5123 (diff) | |
Fix classpaths to work with Java 7's javah
Java 7's javah requires all referenced classes to be classpath,
even if they're just method parameters and never instantiated.
Java 6's version of javah didn't require this.
| -rw-r--r-- | make/build-nativewindow.xml | 2 | ||||
| -rw-r--r-- | make/build-newt.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index e3fcdb5e2..7653452a4 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -675,7 +675,7 @@ </target> <target name="c.build.nativewindow.windowlib.windows" if="isWindows"> - <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.nativewindow.windows.GDI" /> + <javah destdir="${src.generated.c}/Windows" classpath="${classes}:${gluegen.root}/build/classes" class="jogamp.nativewindow.windows.GDI" /> <c.build c.compiler.src.files="c.src.files.windows" output.lib.name="nativewindow_win32" diff --git a/make/build-newt.xml b/make/build-newt.xml index 74263e456..3dc6f5add 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -558,7 +558,7 @@ <target name="c.build.newt.prepare"> <javah destdir="${src.generated.c}/KD" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.kd.KDWindow" /> - <javah destdir="${src.generated.c}/IntelGDL" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.intel.gdl.Display" /> + <javah destdir="${src.generated.c}/IntelGDL" classpath="${gluegen-rt.jar}:${classes}:${build}/nativewindow/classes" class="jogamp.newt.driver.intel.gdl.Display" /> <javah destdir="${src.generated.c}/IntelGDL" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.intel.gdl.Screen" /> <javah destdir="${src.generated.c}/IntelGDL" classpath="${gluegen-rt.jar}:${classes}" class="jogamp.newt.driver.intel.gdl.Window" /> |