diff options
| author | elias <[email protected]> | 2006-07-10 22:20:03 +0000 |
|---|---|---|
| committer | elias <[email protected]> | 2006-07-10 22:20:03 +0000 |
| commit | e7a4d6e386bfec3f2d89c138dae5d99bfa799fd9 (patch) | |
| tree | cab4ffd452fa65cb8ad14888e2af3d97a9af9cc1 /plugins/windows/src | |
| parent | 37df5381227e5fdce1401630ebf5ca8ecfee2502 (diff) | |
Windows: Use pre-defined environment variables for the native include and lib paths
git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@148 e343933a-64c8-49c5-92b1-88f2ce3e89e8
Diffstat (limited to 'plugins/windows/src')
| -rw-r--r-- | plugins/windows/src/native/build.xml | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/plugins/windows/src/native/build.xml b/plugins/windows/src/native/build.xml index a98fbab..42a6ed1 100644 --- a/plugins/windows/src/native/build.xml +++ b/plugins/windows/src/native/build.xml @@ -1,14 +1,14 @@ <?xml version="1.0"?> <project name="JInput dx8 port, Native code" basedir="." default="compile"> - <target name="init"> - </target> + <property environment="env"/> + <property name="dxhome" location="${env.DXSDK_DIR}"/> + <property name="sdkhome" location="${env.MSSDk}"/> - <target name="compile_dir" depends="init"> + <target name="compile_dir"> <echo message="${compiledir}"/> <apply dir="${compiledir}" failonerror="true" executable="cl" dest="${compiledir}" skipemptyfilesets="true"> <arg line="/Ox /Wp64 /W2 /nologo /c"/> - <arg value="/I${toolkithome}\include"/> <arg value="/I${sdkhome}\include"/> <arg value="/I${dxhome}\include"/> <arg value="/I${java.home}\..\include"/> @@ -30,7 +30,6 @@ <arg value="/LIBPATH:${java.home}\lib"/> <arg value="/LIBPATH:${dxhome}\lib\x86"/> <arg value="/LIBPATH:${sdkhome}\lib"/> - <arg value="/LIBPATH:${toolkithome}\lib"/> <arg line="/DLL ${libs}"/> <fileset dir="${commonhome}/src/native" includes="*.obj"/> <fileset dir="." includes="*.obj"/> @@ -47,13 +46,9 @@ </delete> </target> - <target name="compile" depends="init"> - <property name="program_files" location="c:\Programmer"/> - <property name="dxhome" location="${program_files}\Microsoft DirectX SDK (February 2006)"/> - <property name="toolkithome" location="${program_files}\Microsoft Visual C++ Toolkit 2003"/> + <target name="compile"> <property name="rawlibs" value="Kernel32.lib User32.lib Setupapi.lib"/> <property name="dx8libs" value="Kernel32.lib dinput8.lib dxguid.lib User32.lib"/> - <property name="sdkhome" location="${program_files}\Microsoft Platform SDK"/> <property name="commonhome" location="../../../common"/> <property name="dx8dllname" value="jinput-dx8.dll"/> <property name="rawdllname" value="jinput-raw.dll"/> |