diff options
author | endolf <[email protected]> | 2005-06-14 11:19:55 +0000 |
---|---|---|
committer | endolf <[email protected]> | 2005-06-14 11:19:55 +0000 |
commit | 108d97ac40183478384f8a92f3306e94f644b0cf (patch) | |
tree | b0a12e3e83106de666c3488cd32fb9a0a2ae6bcd | |
parent | ee13fe12cf230da1cd9ca9c1dbbe82af9eb428fc (diff) |
For some reason, my ubunto boxes with jdk 1.5.0_02 all seem to have
java.home set to the jre dir, even though a 'which java' reveals it's
using the jdk one, not the jre one. This causes the include dir not to
be found and causes the build to fail. Made it so that the build file
looks for includes relative to the jre dir and the jdk dir, so all
systems should work (yeah, right)
git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@94 e343933a-64c8-49c5-92b1-88f2ce3e89e8
-rw-r--r-- | plugins/linux/src/native/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/linux/src/native/build.xml b/plugins/linux/src/native/build.xml index db2890a..ea5e9ab 100644 --- a/plugins/linux/src/native/build.xml +++ b/plugins/linux/src/native/build.xml @@ -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 --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.so jinput.cpp eventInterface.cpp EventDevice.cpp joystickInterface.cpp JoystickDevice.cpp MixedDevice.cpp"/> </exec> </target> </project> |