From 0a481c9adb4c2251616aefbf0f3cd0f74afe344c Mon Sep 17 00:00:00 2001
From: elias <elias@java.net>
Date: Mon, 17 Jul 2006 11:29:02 +0000
Subject: [PATCH] Windows: More mingw fixes

---
 plugins/windows/src/native/build.xml.mingw             | 10 ++++------
 .../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"