diff options
| author | Sven Gothel <[email protected]> | 2011-08-30 13:03:39 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-08-30 13:03:39 +0200 |
| commit | 0ef3b4a67ba4e287fa7e9407e08838019f6f6cf6 (patch) | |
| tree | 90e37cdb857e3be871538af00d5d18205eb2af0b | |
| parent | 444eaa259116f7985711164512607ad46015fa4b (diff) | |
| parent | cd31c4f0dc7a5f5595e0ca2f0e815d3814ebd94e (diff) | |
Merge remote-tracking branch 'remotes/wwalker/bug_512_no_build_with_Java_7'
| -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" /> |