From c71f96a708f8039e31b891653846cba1375c2d01 Mon Sep 17 00:00:00 2001
From: Endolf <endolf@computerbooth.com>
Date: Wed, 9 May 2018 20:31:37 +0100
Subject: [PATCH] Use javac with the -h arg instead of javah that's now
 deprecated.

---
 plugins/windows/build.xml | 29 -----------------------------
 plugins/windows/pom.xml   |  9 +++++++++
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/plugins/windows/build.xml b/plugins/windows/build.xml
index 7023215..906a986 100644
--- a/plugins/windows/build.xml
+++ b/plugins/windows/build.xml
@@ -2,37 +2,8 @@
 <project name="Direct Input Plugin" basedir=".">
     <target name="init">
         <mkdir dir="target/natives"/>
-        <mkdir dir="target/generated-sources/natives"/>
     </target>
 
-    <target depends="init" name="create_jniheaders">
-		<javah destdir="target/generated-sources/natives">
-            <classpath>
-                <pathelement path="classes"/>
-                <pathelement location="../../coreAPI/classes"/>
-            </classpath>
-			<class name="net.java.games.input.IDirectInput"/>
-			<class name="net.java.games.input.IDirectInputDevice"/>
-			<class name="net.java.games.input.IDirectInputEffect"/>
-		</javah>
-		<javah destdir="target/generated-sources/natives">
-            <classpath>
-                <pathelement path="target/classes"/>
-                <pathelement location="../../coreAPI/target/classes"/>
-            </classpath>
-			<class name="net.java.games.input.DummyWindow"/>
-		</javah>
-		<javah destdir="target/generated-sources/natives">
-            <classpath>
-                <pathelement path="classes"/>
-				<pathelement location="../../coreAPI/bin/jinput-core.jar"/>
-            </classpath>
-			<class name="net.java.games.input.RawInputEnvironmentPlugin"/>
-			<class name="net.java.games.input.RawInputEventQueue"/>
-			<class name="net.java.games.input.RawDevice"/>
-		</javah>
-	</target>
-
     <target name="compile_native" depends="init,create_jniheaders">
         <ant dir="src/native" target="compile"/>
     </target>
diff --git a/plugins/windows/pom.xml b/plugins/windows/pom.xml
index 782e25f..d7da89c 100644
--- a/plugins/windows/pom.xml
+++ b/plugins/windows/pom.xml
@@ -27,6 +27,15 @@
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-h</arg>
+                        <arg>${project.build.directory}/generated-sources/natives</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>