[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3196] trunk/LWJGL

[<en...@us...>]

Revision: 3196
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3196&view=rev
Author:   endolf
Date:     2009-04-08 20:18:29 +0000 (Wed, 08 Apr 2009)

Log Message:
-----------
Updates for building windows 64 bit builds in VC express

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/windows_ant/build.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2009-04-05 22:07:46 UTC (rev 3195)
+++ trunk/LWJGL/build.xml	2009-04-08 20:18:29 UTC (rev 3196)
@@ -270,7 +270,9 @@
 	<!-- Compiles LWJGL on Win32 platforms  -->
 	<target name="-compile_native_win32" if="lwjgl.platform.windows">
 		<ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/>
-		<copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/windows"/>
+		<copy todir="${lwjgl.lib}/windows">
+			<fileset dir="${lwjgl.bin}/lwjgl" includes="lwjgl*.dll"/>
+		</copy>
 	</target>
 
 	<!-- Compiles LWJGL on Linux platforms -->

Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2009-04-05 22:07:46 UTC (rev 3195)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2009-04-08 20:18:29 UTC (rev 3196)
@@ -4,15 +4,11 @@
 	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
 	<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 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c"/>
 			<arg value="/I${sdkhome}\include"/>
-			<arg value="/I${alhome}\include"/>
 			<arg value="/I${java.home}\..\include"/>
 			<arg value="/I${java.home}\..\include\win32"/>
 			<arg value="/I${native}\common"/>
@@ -31,8 +27,7 @@
 			<srcfile/>
 			<arg line="/Fe${dllname} /link"/>
 			<arg value="/LIBPATH:${java.home}\..\lib"/>
-			<arg value="/LIBPATH:${sdkhome}\lib"/>
-			<arg value="/LIBPATH:${alhome}\libs"/>
+			<arg value="/LIBPATH:${sdkhomelib}"/>
 			<arg value="/OPT:REF"/>
 			<arg value="/OPT:ICF"/>
 			<arg line="/DLL /DELAYLOAD:jawt.dll ${libs}"/>
@@ -50,8 +45,13 @@
 	</target>
 	
 	<target name="compile">
-		<echo message="${sdkhome}"/>
-		<echo message="${program_files}"/>
+		<condition property="sdkhomelib" value="${sdkhome}\lib" else="${sdkhome}\lib\x64">
+			<equals arg1="${os.arch}" arg2="x86"/>
+		</condition>
+		<condition property="dllname" value="lwjgl.dll" else="lwjgl64.dll">
+			<equals arg1="${os.arch}" arg2="x86"/>
+		</condition>
+		<echo message="${sdkhomelib}"/>
 		<property name="libs" value="Kernel32.lib ole32.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
 		<antcall target="compile_dir"/>
 		<antcall target="link"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.