summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--make/build-nativewindow.xml68
1 files changed, 62 insertions, 6 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 1f40f3535..d7f138a6a 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -324,6 +324,68 @@
- will be generated.
-->
<target name="java.compile.javase" depends="java.generate">
+ <!-- create native headers first -->
+ <if>
+ <istrue value="${isX11}"/>
+ <then>
+ <javac srcdir="${src.java}:${src.generated.java}"
+ destdir="${classes}"
+ excludes="${java.excludes.all}"
+ nativeheaderdir="${src.generated.c}/X11"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+ <classpath refid="swt_gluegen.classpath"/>
+ <include name="jogamp/nativewindow/x11/X11Lib.java" />
+ <include name="jogamp/nativewindow/x11/X11Util.java" />
+ </javac>
+ </then>
+ </if>
+ <if>
+ <istrue value="${isWindows}"/>
+ <then>
+ <javac srcdir="${src.java}:${src.generated.java}"
+ destdir="${classes}"
+ excludes="${java.excludes.all}"
+ nativeheaderdir="${src.generated.c}/Windows"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+ <classpath refid="swt_gluegen.classpath"/>
+ <include name="jogamp/nativewindow/windows/GDI.java" />
+ <include name="jogamp/nativewindow/windows/GDIUtil.java" />
+ </javac>
+ </then>
+ </if>
+ <if>
+ <istrue value="${isOSX}"/>
+ <then>
+ <javac srcdir="${src.java}:${src.generated.java}"
+ destdir="${classes}"
+ excludes="${java.excludes.all}"
+ nativeheaderdir="${src.generated.c}/MacOSX"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+ <classpath refid="swt_gluegen.classpath"/>
+ <include name="jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java" />
+ <include name="jogamp/nativewindow/macosx/OSXUtil.java" />
+ </javac>
+ </then>
+ </if>
+
<!-- Perform the second pass Java compile; everything. -->
<javac destdir="${classes}"
excludes="${java.excludes.all}"
@@ -817,8 +879,6 @@
</target>
<target name="c.build.nativewindow.windowlib.x11" if="isX11">
- <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.nativewindow.x11.X11Lib, jogamp.nativewindow.x11.X11Util" />
-
<c.build c.compiler.src.files="c.src.files.x11"
output.lib.name="nativewindow_x11"
compiler.cfg.id="${compiler.cfg.id}"
@@ -826,8 +886,6 @@
</target>
<target name="c.build.nativewindow.windowlib.windows" if="isWindows">
- <javah destdir="${src.generated.c}/Windows" classpath="${javah.classpath}" class="jogamp.nativewindow.windows.GDI, jogamp.nativewindow.windows.GDIUtil" />
-
<c.build c.compiler.src.files="c.src.files.windows"
output.lib.name="nativewindow_win32"
compiler.cfg.id="${compiler.cfg.id}"
@@ -835,8 +893,6 @@
</target>
<target name="c.build.nativewindow.windowlib.macosx" if="isOSX">
- <javah destdir="${src.generated.c}/MacOSX" classpath="${javah.classpath}" class="jogamp.nativewindow.macosx.OSXUtil, jogamp.nativewindow.jawt.macosx.MacOSXJAWTWindow" />
-
<c.build c.compiler.src.files="c.src.files.macosx"
output.lib.name="nativewindow_macosx"
compiler.cfg.id="${compiler.cfg.id}"