File gluegen2-jdk10.patch of Package gluegen2

Overview Repositories Revisions Requests Users Attributes Meta

File gluegen2-jdk10.patch of Package gluegen2

diff -urEbwB gluegen-v2.3.2/make/build.xml gluegen-v2.3.2/make/build.xml
--- gluegen-v2.3.2/make/build.xml	2017-12-22 15:46:45.393105390 +0100
+++ gluegen-v2.3.2/make/build.xml	2017-12-22 16:00:38.113906138 +0100
@@ -440,14 +440,10 @@
       <antcall target="gluegen.build.c.impl" inheritAll="true" inheritRefs="true" />
     </target>
 
-    <target name="gluegen.build.c.impl" depends="init, c.configure" unless="gluegen.build.skip.c">
+    <target name="gluegen.build.c.impl" depends="init, c.configure, gluegen.build.javase" unless="gluegen.build.skip.c">
       <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}" />
 
       <mkdir dir="${gluegen.lib.dir}"/>
@@ -485,9 +481,6 @@
           <sysincludepath path="${stub.includes.dir}/platform"/>
 
           <includepath path="${src.generated.c}" />
-          <includepath path="${src.generated.c}/Unix" if="isUnix"/>
-          <includepath path="${src.generated.c}/Unix" if="isOSX"/>
-          <includepath path="${src.generated.c}/Windows" if="isWindows"/>
         </compiler>
 
         <linker extends="${linker.cfg.id}" />
@@ -723,7 +716,7 @@
       - original source. -->
 
     
-    <javac destdir="${classes}"
+    <javac destdir="${classes}" nativeheaderdir="${src.generated.c}"
            includeAntRuntime="false"
            includes="${gluegen-rt.classes} ${jogamp.common.classes}"
            excludes="${gluegen.excludes.all} ${java.part.android}"

Places

File gluegen2-jdk10.patch of Package gluegen2

Places