diff options
| author | elias <[email protected]> | 2006-07-17 11:29:02 +0000 |
|---|---|---|
| committer | elias <[email protected]> | 2006-07-17 11:29:02 +0000 |
| commit | a085a9ba87b06f7af7b5de345ce99eaddfc71e37 (patch) | |
| tree | 88a0eb623a47e0b79957a33876a971c9cecf6de8 | |
| parent | 8509e52970c26b426f6eba4714207194da8ec831 (diff) | |
Windows: More mingw fixes
git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@156 e343933a-64c8-49c5-92b1-88f2ce3e89e8
| -rw-r--r-- | plugins/windows/src/native/build.xml.mingw | 10 | ||||
| -rw-r--r-- | plugins/windows/src/native/raw/net_java_games_input_RawDevice.c | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/plugins/windows/src/native/build.xml.mingw b/plugins/windows/src/native/build.xml.mingw index 92af6d7..fd37224 100644 --- a/plugins/windows/src/native/build.xml.mingw +++ b/plugins/windows/src/native/build.xml.mingw @@ -3,7 +3,7 @@ <project name="JInput dx8 port, Native code" basedir="." default="compile"> <property environment="env"/> <property name="dxhome" location="${env.DXSDK_DIR}"/> - <property name="sdkhome" location="${env.MSSDk}"/> + <property name="plthome" location="${env.MSSdk}"/> <property name="chome" location="c:/MinGW"/> <property name="gcc" location="${chome}/bin/gcc"/> @@ -11,7 +11,6 @@ <echo message="${compiledir}"/> <apply dir="${compiledir}" failonerror="true" executable="${gcc}" dest="${compiledir}" skipemptyfilesets="true"> <arg line="-c -Wall -O2 -std=gnu99"/> - <arg value="-I${sdkhome}/include"/> <arg value="-I${dxhome}/include"/> <arg value="-I${java.home}/../include"/> <arg value="-I${java.home}/../include/win32"/> @@ -24,13 +23,12 @@ </target> <target name="link"> - <apply dir="." parallel="true" executable="cl" failonerror="true"> + <apply dir="." parallel="true" executable="${gcc}" failonerror="true"> <arg value="-Wl,--kill-at"/> <arg line="-shared -o ${dllname}"/> <srcfile/> <arg value="-L${java.home}/lib"/> <arg value="-L${dxhome}/lib/x86"/> - <arg value="-L${sdkhome}/lib"/> <arg line="${libs}"/> <fileset dir="${commonhome}/src/native" includes="*.o"/> <fileset dir="." includes="*.o"/> @@ -48,8 +46,8 @@ </target> <target name="compile"> - <property name="rawlibs" value="Kernel32 User32 Setupapi"/> - <property name="dx8libs" value="Kernel32 dinput8 dxguid User32"/> + <property name="rawlibs" value="-lkernel32 -luser32 -lsetupapi"/> + <property name="dx8libs" value="-lkernel32 -ldinput8 -ldxguid -luser32"/> <property name="commonhome" location="../../../common"/> <property name="dx8dllname" value="jinput-dx8.dll"/> <property name="rawdllname" value="jinput-raw.dll"/> diff --git a/plugins/windows/src/native/raw/net_java_games_input_RawDevice.c b/plugins/windows/src/native/raw/net_java_games_input_RawDevice.c index 3730a6c..5a031c7 100644 --- a/plugins/windows/src/native/raw/net_java_games_input_RawDevice.c +++ b/plugins/windows/src/native/raw/net_java_games_input_RawDevice.c @@ -7,6 +7,7 @@ #include "rawwinver.h" #include <windows.h> +#include <winuser.h> #include <jni.h> #include "net_java_games_input_RawDevice.h" #include "util.h" |