|
0 |
Description: Fixes the compatibility with Java 10
|
|
1 |
Author: Emmanuel Bourg <ebourg@apache.org>
|
|
2 |
Forwarded: no
|
|
3 |
--- a/plugins/linux/build.xml
|
|
4 |
+++ b/plugins/linux/build.xml
|
|
5 |
@@ -12,7 +12,7 @@
|
|
6 |
|
|
7 |
<target depends="init" name="compile">
|
|
8 |
<!-- <ant dir="src/native" target="createNativeDefinitions.java"/>-->
|
|
9 |
- <javac debug="true" deprecation="true" destdir="classes" source="1.4" target="1.4" srcdir="src/java">
|
|
10 |
+ <javac debug="true" deprecation="true" destdir="classes" source="1.4" target="1.4" srcdir="src/java" nativeHeaderDir="src/native">
|
|
11 |
<classpath>
|
|
12 |
<pathelement location="../../coreAPI/bin/jinput-core.jar"/>
|
|
13 |
<pathelement location="../../lib/jutils.jar"/>
|
|
14 |
@@ -53,13 +53,6 @@
|
|
15 |
</target>
|
|
16 |
|
|
17 |
<target depends="init,compile" name="createJNIHeaders">
|
|
18 |
- <javah destdir="src/native">
|
|
19 |
- <classpath>
|
|
20 |
- <pathelement location="classes"/>
|
|
21 |
- </classpath>
|
|
22 |
- <class name="net.java.games.input.LinuxEventDevice"/>
|
|
23 |
- <class name="net.java.games.input.LinuxJoystickDevice"/>
|
|
24 |
- </javah>
|
|
25 |
</target>
|
|
26 |
|
|
27 |
<target depends="init,createJNIHeaders" name="compileNativeJinputLib" if="linux">
|
|
28 |
--- a/plugins/wintab/build.xml
|
|
29 |
+++ b/plugins/wintab/build.xml
|
|
30 |
@@ -9,7 +9,7 @@
|
|
31 |
</target>
|
|
32 |
|
|
33 |
<target name="compile" depends="init">
|
|
34 |
- <javac srcdir="../windows/src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4">
|
|
35 |
+ <javac srcdir="../windows/src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4" nativeHeaderDir="src/native">
|
|
36 |
<include name="**/DummyWindow.java"/>
|
|
37 |
</javac>
|
|
38 |
|
|
39 |
@@ -23,16 +23,6 @@
|
|
40 |
</target>
|
|
41 |
|
|
42 |
<target depends="init,compile" name="create_jniheaders">
|
|
43 |
- <javah destdir="src/native">
|
|
44 |
- <classpath>
|
|
45 |
- <pathelement path="classes"/>
|
|
46 |
- <pathelement location="../../coreAPI/classes"/>
|
|
47 |
- </classpath>
|
|
48 |
- <class name="net.java.games.input.DummyWindow"/>
|
|
49 |
- <class name="net.java.games.input.WinTabContext"/>
|
|
50 |
- <class name="net.java.games.input.WinTabDevice"/>
|
|
51 |
- <class name="net.java.games.input.WinTabComponent"/>
|
|
52 |
- </javah>
|
|
53 |
</target>
|
|
54 |
|
|
55 |
<target name="compile_native" depends="init,create_jniheaders" if="wintab">
|
|
56 |
--- a/plugins/OSX/build.xml
|
|
57 |
+++ b/plugins/OSX/build.xml
|
|
58 |
@@ -18,7 +18,7 @@
|
|
59 |
</target>
|
|
60 |
|
|
61 |
<target depends="init" name="compile">
|
|
62 |
- <javac debug="true" deprecation="true" destdir="${build}" source="1.4" srcdir="src/java">
|
|
63 |
+ <javac debug="true" deprecation="true" destdir="${build}" source="1.4" srcdir="src/java" nativeHeaderDir="src/native">
|
|
64 |
<classpath>
|
|
65 |
<pathelement location="../../coreAPI/bin/jinput-core.jar"/>
|
|
66 |
<pathelement location="../../lib/jutils.jar"/>
|
|
67 |
@@ -59,15 +59,6 @@
|
|
68 |
</target>
|
|
69 |
|
|
70 |
<target depends="init,compile" name="createJNIHeaders">
|
|
71 |
- <javah destdir="src/native">
|
|
72 |
- <classpath>
|
|
73 |
- <pathelement path="${build}"/>
|
|
74 |
- <pathelement location="../../coreAPI/classes"/>
|
|
75 |
- </classpath>
|
|
76 |
- <class name="net.java.games.input.OSXHIDDeviceIterator"/>
|
|
77 |
- <class name="net.java.games.input.OSXHIDDevice"/>
|
|
78 |
- <class name="net.java.games.input.OSXHIDQueue"/>
|
|
79 |
- </javah>
|
|
80 |
</target>
|
|
81 |
|
|
82 |
|