[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2454] trunk/LWJGL/platform_build/linux_ant/build.xm

Revision: 2454
Author:   elias_naur
Date:     2006-07-07 07:02:13 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2454&view=rev

Log Message:
-----------
Linux: Support x86_64 building

Modified Paths:
--------------
    trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-07 12:41:36 UTC (rev 2453)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-07 14:02:13 UTC (rev 2454)
@@ -3,9 +3,9 @@
 <project name="lwjgl native code, linux" basedir="../../bin" default="compile">
 	<property name="native" location="../src/native"/>
 	<property name="libname" value="liblwjgl.so"/>
-	<property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
+	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
+	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lpthread -L${java.home}/lib/amd64 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
 	<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
-	<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
 	
 	<target name="clean">
 		<delete>
@@ -15,6 +15,15 @@
 	</target>
 	
     <target name="compile">
+		<exec executable="uname" outputproperty="hwplatform">
+			<arg value="-i"/>
+		</exec>
+		<echo message="${hwplatform}"/>
+		<condition property="libs" value="${libs64}" else="${libs32}">
+			<equals arg1="${hwplatform}" arg2="x86_64"/>
+		</condition>
+		<echo message="${libs}"/>
+		<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
 		<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
 			<arg line="${cflags}"/>
 			<arg value="-I${java.home}/include"/>


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