From f5fd1c3de1341c5469f5ee806f6d74db720417e3 Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Mon, 10 Jul 2006 22:26:39 +0000
Subject: [PATCH] Windows: Use standard environment variables for build paths

---
 platform_build/windows_ant/build.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/platform_build/windows_ant/build.xml b/platform_build/windows_ant/build.xml
index 183a8f7b..6b7a4474 100644
--- a/platform_build/windows_ant/build.xml
+++ b/platform_build/windows_ant/build.xml
@@ -2,18 +2,23 @@
 
 <project name="lwjgl native code, native code" basedir="../../bin" default="compile">
 	<property name="native" location="../src/native"/>
+	<property environment="env"/>
+	<property name="dxhome" location="${env.DXSDK_DIR}"/>
+	<property name="sdkhome" location="${env.MSSDk}"/>
+	<property name="program_files" location="${env.ProgramFiles}"/>
+	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
+	<property name="dllname" value="lwjgl.dll"/>
 
 	<target name="compile_dir">
 		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
 			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
-			<arg value="/I${toolkithome}\include"/>
 			<arg value="/I${sdkhome}\include"/>
 			<arg value="/I${dxhome}\include"/>
 			<arg value="/I${alhome}\include"/>
 			<arg value="/I${java.home}\..\include"/>
 			<arg value="/I${java.home}\..\include\win32"/>
-			<arg value="/I${native}/common"/>
-			<arg value="/I${native}/win32"/>
+			<arg value="/I${native}\common"/>
+			<arg value="/I${native}\win32"/>
 			<srcfile/>
 			<fileset dir="${native}/win32" includes="*.c"/>
 			<fileset dir="${native}/common" includes="*.c"/>
@@ -31,7 +36,6 @@
 			<arg value="/LIBPATH:${dxhome}\lib\x86"/>
 			<arg value="/LIBPATH:${sdkhome}\lib"/>
 			<arg value="/LIBPATH:${alhome}\libs"/>
-			<arg value="/LIBPATH:${toolkithome}\lib"/>
 			<arg value="/OPT:REF"/>
 			<arg value="/OPT:ICF"/>
 			<arg line="/DLL /DELAYLOAD:jawt.dll ${libs}"/>
@@ -47,12 +51,6 @@
 	</target>
 
 	<target name="compile">
-		<property name="program_files" location="c:\Program Files"/>
-		<property name="dxhome" location="${program_files}\Microsoft DirectX SDK (February 2006)"/>
-		<property name="toolkithome" location="${program_files}\Microsoft Visual C++ Toolkit 2003"/>
-		<property name="sdkhome" location="${program_files}\Microsoft Platform SDK"/>
-		<property name="alhome" location="${program_files}\OpenAL 1.0 Software Development Kit"/>
-		<property name="dllname" value="lwjgl.dll"/>
 		<property name="libs" value="Kernel32.lib ole32.lib dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
 		<antcall target="compile_dir"/>
 		<antcall target="link"/>