aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/linux/src
diff options
context:
space:
mode:
authorendolf <[email protected]>2005-06-19 15:33:12 +0000
committerendolf <[email protected]>2005-06-19 15:33:12 +0000
commit913fd0d94ffb7f700c444020e2ca44c4bc44ef5a (patch)
treeac46a53c8b61a3111cf9b98c51b4df247d0b5899 /plugins/linux/src
parent0768f203a4015dcccb91dcc94b61c9a63cd7b436 (diff)
Updated the name of the linux native library
git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@102 e343933a-64c8-49c5-92b1-88f2ce3e89e8
Diffstat (limited to 'plugins/linux/src')
-rw-r--r--plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java2
-rw-r--r--plugins/linux/src/native/build.xml4
2 files changed, 3 insertions, 3 deletions
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>