From d222fad271101fe605e70f0d4b87931a48cbfa8b Mon Sep 17 00:00:00 2001
From: endolf <endolf@java.net>
Date: Sun, 19 Jun 2005 15:33:12 +0000
Subject: [PATCH] Updated the name of the linux native library

---
 build.xml                                                   | 1 +
 plugins/linux/build.xml                                     | 6 +++---
 .../java/net/java/games/input/LinuxEnvironmentPlugin.java   | 2 +-
 plugins/linux/src/native/build.xml                          | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 245ec7c..db28a00 100644
--- a/build.xml
+++ b/build.xml
@@ -84,6 +84,7 @@
         <ant dir="plugins/DX8" target="clean"/>
         <ant dir="plugins/linux" target="clean"/>
 		<ant dir="plugins/OSX" target="clean"/>
+    	<ant dir="plugins/awt" target="clean"/>
         <ant dir="coreAPI" target="clean"/>
         <delete failonerror="no">
             <fileset dir="dist">
diff --git a/plugins/linux/build.xml b/plugins/linux/build.xml
index 5e9d572..89c4eeb 100644
--- a/plugins/linux/build.xml
+++ b/plugins/linux/build.xml
@@ -52,9 +52,9 @@
             </fileset>
         </delete>
         <delete file="bin/linux.jar" failonerror="no"/>
-        <delete file="src/native/libjinput.so" failonerror="no"/>
+        <delete file="src/native/libjinput-linux.so" failonerror="no"/>
         <delete file="../../coreAPI/src/tests/controller/linux.jar" failonerror="no" />
-        <delete file="../../coreAPI/src/tests/controller/libjinput.so" failonerror="no"/>
+        <delete file="../../coreAPI/src/tests/controller/libjinput-linux.so" failonerror="no"/>
         <delete file="apidoc" failonerror="no"/>
     </target>
 
@@ -78,6 +78,6 @@
     
     <target depends="init" name="compileNativeJinputLib">
         <ant dir="src/native" target="compileNativeJinputLib"/>
-        <copy file="src/native/libjinput.so" todir="../../coreAPI/src/tests/controller" />
+        <copy file="src/native/libjinput-linux.so" todir="../../coreAPI/src/tests/controller" />
     </target>
 </project>
diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java b/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
index 1747ca3..fc19780 100644
--- a/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
+++ b/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
@@ -34,7 +34,7 @@ public class LinuxEnvironmentPlugin extends ControllerEnvironment implements Plu
     
     static {
         if(isSupported()) {
-            System.loadLibrary("jinput");
+            System.loadLibrary("jinput-linux");
         }
     }    
 
diff --git a/plugins/linux/src/native/build.xml b/plugins/linux/src/native/build.xml
index ea5e9ab..f055249 100644
--- a/plugins/linux/src/native/build.xml
+++ b/plugins/linux/src/native/build.xml
@@ -5,7 +5,7 @@
 <!-- If not, you may prefer to adjust the basedir, or move some directories around. -->
 <!-- The idea is that both Ant and NetBeans have to know what the package root is -->
 <!-- for the classes in your application. -->
-<project name="JInput Linux port, Native code" basedir="." default="all">
+<project name="JInput Linux port, Native code" basedir="." default="compileNativeJinputLib">
 
     <!-- Don't worry if you don't know the Ant syntax completely or need help on some tasks! -->
     <!-- The standard Ant documentation is bundled. See Help | Help Sets | Ant 1.4.1 Manual. -->
@@ -48,7 +48,7 @@
 
     <target name="compileNativeJinputLib" depends="init">
         <exec dir="." executable="g++" os="Linux">
-            <arg line="-I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux --shared -DLOGTRACE -o libjinput.so jinput.cpp eventInterface.cpp EventDevice.cpp joystickInterface.cpp JoystickDevice.cpp MixedDevice.cpp"/>
+            <arg line="-I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux --shared -DLOGTRACE -o libjinput-linux.so jinput.cpp eventInterface.cpp EventDevice.cpp joystickInterface.cpp JoystickDevice.cpp MixedDevice.cpp"/>
         </exec>
     </target>
 </project>