diff options
| author | endolf <[email protected]> | 2009-03-31 20:16:53 +0000 |
|---|---|---|
| committer | endolf <[email protected]> | 2009-03-31 20:16:53 +0000 |
| commit | 6b0785b3dc856323c8a976eea2c890d76768ab96 (patch) | |
| tree | 5f3600a936712fd0c222f9040ff0b45942bd1213 | |
| parent | bac3720d546ff5890bab19484583e7e409c6df83 (diff) | |
The environment under windows decides if it's a 64 bit build or not. On 64 bit windows assume a 64 bit one.
git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@223 e343933a-64c8-49c5-92b1-88f2ce3e89e8
| -rw-r--r-- | plugins/windows/src/native/build.xml | 23 |
1 files 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> |