From 38d108b857a2ca60aff94b7bc549c53c5dcd7b4f Mon Sep 17 00:00:00 2001
From: endolf <endolf@java.net>
Date: Sun, 19 Jun 2005 17:41:40 +0000
Subject: [PATCH] Changed the binary library name

---
 plugins/DX8/build.xml                                     | 8 ++++----
 .../java/games/input/DirectInputEnvironmentPlugin.java    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/DX8/build.xml b/plugins/DX8/build.xml
index ef20e6f..1e8fa8c 100644
--- a/plugins/DX8/build.xml
+++ b/plugins/DX8/build.xml
@@ -41,10 +41,10 @@
         <exec dir="." executable="g++" os="Windows 2000, Windows XP, Windows 98">
             <arg line=" -D_STRICT_ANSI -D_JNI_IMPLEMENTATION_"/> 
             <arg line=" -I'${java.home}/../include' -I'${java.home}/../include/win32' -Ic:/dx9/include"/>
-            <arg line=" -o bin/dxinput.dll src/native/input.cpp  -Wl,--export-all-symbols"/>
+            <arg line=" -o bin/jinput-dxplugin.dll src/native/input.cpp  -Wl,--export-all-symbols"/>
             <arg line=" -shared -Wl,--kill-at  -ldxguid -ldinput -ldinput8"/>
         </exec>   
-        <copy file="bin/dxinput.dll" todir="../../coreAPI/src/tests/controller" />           
+        <copy file="bin/jinput-dxplugin.dll" todir="../../coreAPI/src/tests/controller" />           
     </target>
 
     <target name="jar" depends="init,compile">
@@ -94,9 +94,9 @@
             </fileset>
         </delete>
     <delete file="bin/dxinput.jar" failonerror="no"/>
-    <delete file="bin/dxinput.dll" failonerror="no"/>
+    <delete file="bin/jinput-dxplugin.dll" failonerror="no"/>
     <delete file="../../coreAPI/src/tests/controller/dxinput.jar" failonerror="no" />
-    <delete file="../../coreAPI/src/tests/controller/dxinput.dll" failonerror="no"/>
+    <delete file="../../coreAPI/src/tests/controller/jinput-dxplugin.dll" failonerror="no"/>
     <delete dir="../../docs/input/win32/apidoc" failonerror="no"/>
     </target>
 
diff --git a/plugins/DX8/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java b/plugins/DX8/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java
index 4b3c95d..d74d023 100644
--- a/plugins/DX8/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java
+++ b/plugins/DX8/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java
@@ -59,7 +59,7 @@ public class DirectInputEnvironmentPlugin extends ControllerEnvironment
             new LoadLibraryAction("jinput"));
          */
         if(isSupported()) {
-            System.loadLibrary("dxinput");
+            System.loadLibrary("jinput-dxplugin");
         }
     }