diff options
| author | Wade Walker <[email protected]> | 2018-12-25 09:47:04 -0600 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-08-16 23:28:02 +0200 |
| commit | 0e915e519cad5f23dcea1707b894f2b5b869bbf1 (patch) | |
| tree | b3520b6256edc2fd52b94b68818318c887584a8c | |
| parent | 4df8c0112b1e6f3236428cd8429d034058a98f6b (diff) | |
Fixed native header generation so it doesn't use javah
The javah command was removed in Java 10, so now native headers must be
generated in javac instead.
| -rw-r--r-- | make/build.xml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/make/build.xml b/make/build.xml index 3d247f3..c9b2e44 100644 --- a/make/build.xml +++ b/make/build.xml @@ -467,10 +467,6 @@ <fail message="Requires '${compiler.cfg.id}'" unless="compiler.cfg.id"/> <fail message="Requires '${linker.cfg.id}'" unless="linker.cfg.id"/> - <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.os.Platform, com.jogamp.common.nio.PointerBuffer, jogamp.common.jvm.JVMUtil, com.jogamp.common.util.JarUtil, jogamp.common.os.MachineDataInfoRuntime" /> - <javah destdir="${src.generated.c}/Unix" classpath="${classes}" class="jogamp.common.os.UnixDynamicLinkerImpl" /> - <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.common.os.WindowsDynamicLinkerImpl"/> - <echo message="Output lib name = ${output.lib.name} -> ${output.lib.name.os} [${output.lib.type}]" /> <mkdir dir="${gluegen.lib.dir}"/> @@ -768,14 +764,13 @@ <param name="target" value="JavaParser.g" /> </antcall> - <!-- Build GlueGen using the generated Java files along with the - - original source. --> - - <!-- Compile gluegen-rt first --> + <!-- Build GlueGen using the generated Java files along with the original source. + Compile gluegen-rt first and generate native headers. --> <javac destdir="${classes}" includeAntRuntime="false" includes="${gluegen-rt.classes} ${jogamp.common.classes}" excludes="${gluegen.excludes.all} ${java.part.android}" + nativeheaderdir="${src.generated.c}" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" @@ -787,6 +782,10 @@ <classpath refid="cc_gluegen.classpath" /> </javac> + <!-- move platform-specific native headers into the right directories --> + <move file="${src.generated.c}/jogamp_common_os_UnixDynamicLinkerImpl.h" todir="${src.generated.c}/Unix"/> + <move file="${src.generated.c}/jogamp_common_os_WindowsDynamicLinkerImpl.h" todir="${src.generated.c}/Windows"/> + <!-- make non-java code available in classpath --> <copy todir="${classes}"> <fileset dir="${src.java}" |