Updated the name of the linux native library

This commit is contained in:
endolf 2005-06-19 15:33:12 +00:00
parent c2bbf1d876
commit d222fad271
4 changed files with 7 additions and 6 deletions

View file

@ -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">

View file

@ -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>

View file

@ -34,7 +34,7 @@ public class LinuxEnvironmentPlugin extends ControllerEnvironment implements Plu
static {
if(isSupported()) {
System.loadLibrary("jinput");
System.loadLibrary("jinput-linux");
}
}

View file

@ -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>