Package: jinput / 20100502+dfsg-4

01build.xml.jni Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
Description: Same binary file name for all archs.
Author: Gabriele Giacone <1o5g4r8o@gmail.com>

--- jinput-2.0.1~cvs20100404.orig/plugins/linux/build.xml
+++ jinput-2.0.1~cvs20100404/plugins/linux/build.xml
@@ -65,7 +65,7 @@
     <target depends="init,createJNIHeaders" name="compileNativeJinputLib" if="linux">
         <ant dir="src/native" target="compileNativeJinputLib"/>
         <copy todir="bin">
- 	       <fileset dir="src/native" includes="libjinput-linux*.so"/>
+ 	       <fileset dir="src/native" includes="libjinput.so"/>
 	   </copy>
     </target>
 </project>
--- jinput-2.0.1~cvs20100404.orig/plugins/linux/src/native/build.xml
+++ jinput-2.0.1~cvs20100404/plugins/linux/src/native/build.xml
@@ -8,6 +8,7 @@
 <project name="JInput Linux port, Native code" basedir="." default="compileNativeJinputLib">
 	<property name="libname64" value="libjinput-linux64.so"/>
 	<property name="libname32" value="libjinput-linux.so"/>
+	<property name="libname" value="libjinput.so"/>
 	
 	<target name="createNativeDefinitions.java">
 		<exec dir="." executable="gawk" os="Linux" output="../java/net/java/games/input/NativeDefinitions.java">
@@ -28,9 +29,9 @@
 		<exec executable="uname" outputproperty="hwplatform">
 			<arg value="-m"/>
 		</exec>
-		<condition property="libname" value="${libname64}" else="${libname32}">
+<!--		<condition property="libname" value="${libname64}" else="${libname32}">
 			<equals arg1="${hwplatform}" arg2="x86_64"/>
-		</condition>
+		</condition>	-->
 		<apply dir="." executable="cc" os="Linux" dest="." skipemptyfilesets="true" failonerror="true">
 			<arg line="-O2 -Wall -c -fPIC"/>
 			<arg value="-I${java.home}/include"/>
--- jinput-2.0.1~cvs20100404.orig/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
+++ jinput-2.0.1~cvs20100404/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
@@ -39,8 +39,8 @@ import java.security.PrivilegedAction;
  * @author Jeremy Booth (jeremy@newdawnsoftware.com)
  */
 public final class LinuxEnvironmentPlugin extends ControllerEnvironment implements Plugin {
-	private final static String LIBNAME = "jinput-linux";
-	private final static String POSTFIX64BIT = "64";
+	private final static String LIBNAME = "jinput";
+	private final static String POSTFIX64BIT = "";
 	private static boolean supported = false;
 	
     private final Controller[] controllers;