From d60c807a24cb973becb867c1d528ef808ce15ea3 Mon Sep 17 00:00:00 2001
From: endolf <endolf@java.net>
Date: Tue, 31 Mar 2009 20:16:53 +0000
Subject: [PATCH] The environment under windows decides if it's a 64 bit build
 or not. On 64 bit windows assume a 64 bit one.

---
 plugins/windows/src/native/build.xml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/plugins/windows/src/native/build.xml b/plugins/windows/src/native/build.xml
index 7925b70..129e514 100644
--- a/plugins/windows/src/native/build.xml
+++ b/plugins/windows/src/native/build.xml
@@ -9,8 +9,9 @@
 		<echo message="${compiledir}"/>
 		<echo message="sdkhome: ${sdkhome}"/>
 		<echo message="dxhome: ${dxhome}"/>
+		<echo message="target arch: ${os.arch}"/>
 		<apply dir="${compiledir}" failonerror="true" executable="cl" dest="${compiledir}" skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /c"/>
+			<arg line="/Ox /W2 /nologo /c"/>
 			<arg value="/I${sdkhome}\include"/>
 			<arg value="/I${dxhome}\include"/>
 			<arg value="/I${java.home}\..\include"/>
@@ -30,8 +31,8 @@
 			<srcfile/>
 			<arg line="/Fe${dllname} /link"/>
 			<arg value="/LIBPATH:${java.home}\lib"/>
-			<arg value="/LIBPATH:${dxhome}\lib"/>
-			<arg value="/LIBPATH:${sdkhome}\lib"/>
+			<arg value="/LIBPATH:${dxhomelib}"/>
+			<arg value="/LIBPATH:${sdkhomelib}"/>
 			<arg line="/DLL ${libs}"/>
 			<fileset dir="${commonhome}/src/native" includes="*.obj"/>
 			<fileset dir="." includes="*.obj"/>
@@ -45,6 +46,7 @@
 			<fileset dir="raw" includes="*.obj"/>
 			<fileset dir="dx8" includes="*.obj"/>
 			<fileset dir="." includes="*.dll"/>
+			<fileset dir="../../../common/src/native" includes="*.obj"/>
 		</delete>
 	</target>
 
@@ -52,8 +54,19 @@
 		<property name="rawlibs" value="Kernel32.lib User32.lib Setupapi.lib"/>
 		<property name="dx8libs" value="Kernel32.lib dinput8.lib dxguid.lib User32.lib"/>
 		<property name="commonhome" location="../../../common"/>
-		<property name="dx8dllname" value="jinput-dx8.dll"/>
-		<property name="rawdllname" value="jinput-raw.dll"/>
+		
+		<condition property="dx8dllname" value="jinput-dx8.dll" else="jinput-dx8_64.dll">
+			<equals arg1="${os.arch}" arg2="x86"/>
+		</condition>
+		<condition property="rawdllname" value="jinput-raw.dll" else="jinput-raw_64.dll">
+			<equals arg1="${os.arch}" arg2="x86"/>
+		</condition>
+		<condition property="dxhomelib" value="${dxhome}\lib" else="${dxhome}\lib\x64">
+			<equals arg1="${os.arch}" arg2="x86"/>
+		</condition>
+		<condition property="sdkhomelib" value="${sdkhome}\lib" else="${sdkhome}\lib\x64">
+			<equals arg1="${os.arch}" arg2="x86"/>
+		</condition>
 		<antcall target="compile_dir">
 			<param name="compiledir" location="${commonhome}/src/native"/>
 		</antcall>