From c0b72342e6fb8060d5721b2693559451a820a281 Mon Sep 17 00:00:00 2001
From: Michael Pfaff <michael@pfaff.dev>
Date: Sun, 25 Jun 2023 18:35:37 -0400
Subject: [PATCH] Configurable compiler on linux, dos2unix on a file,
 consistent indentation

---
 platform_build/build-definitions.xml | 391 ++++++++++++++-------------
 platform_build/linux_ant/build.xml   | 102 +++----
 2 files changed, 249 insertions(+), 244 deletions(-)

diff --git a/platform_build/build-definitions.xml b/platform_build/build-definitions.xml
index 3f2fc322..d8c4bda4 100644
--- a/platform_build/build-definitions.xml
+++ b/platform_build/build-definitions.xml
@@ -1,193 +1,198 @@
-<project name="definitions" basedir="/dev/null">
-	<!-- ================================================================== -->
-	<!-- Global properties for build 																				-->
-	<!-- ================================================================== -->
-	<property name="lwjgl.version" 				    		value="2.9.4" />
-	<property name="lwjgl.web" 					    		location="www" />
-	<property name="lwjgl.lib" 					    		location="libs" />
-    <property name="lwjgl.target"   			    		location="target" />
-
-	<!-- Intermediates -->
-	<property name="lwjgl.target.gen" 			    		location="${lwjgl.target}/gen" />
-    <property name="lwjgl.target.gen.classes" 				location="${lwjgl.target.gen}/classes" />
-    <property name="lwjgl.target.gen.java" 					location="${lwjgl.target.gen}/java" />
-    <property name="lwjgl.target.gen.headers" 				location="${lwjgl.target.gen}/headers" />
-    <property name="lwjgl.target.gen.native" 				location="${lwjgl.target.gen}/native" />
-	<property name="lwjgl.target.gen.obj" 				    location="${lwjgl.target.gen}/obj" />
-	<property name="lwjgl.target.staging" 	 				location="${lwjgl.target}/staging" />
-
-	<!-- Artifacts -->
-    <property name="lwjgl.target.jars"						location="${lwjgl.target}/jars" />
-    <property name="lwjgl.target.natives"					location="${lwjgl.target}/natives" />
-    <property name="lwjgl.target.doc" 				    	location="${lwjgl.target}/doc" />
-	<property name="lwjgl.target.bundle" 				    location="${lwjgl.target}/bundle" />
-
-	<!-- Sources -->
-	<property name="lwjgl.src" 					        	location="src" />
-	<property name="lwjgl.src.java" 			    		location="${lwjgl.src}/java" />
-	<property name="lwjgl.src.native" 			    		location="${lwjgl.src}/native" />
-    <property name="lwjgl.src.templates"		            location="${lwjgl.src}/templates" />
-    <property name="lwjgl.src.stubs"						location="${lwjgl.src}/stubs" />
-
-	<property name="lwjgl.src.templates.al"                 location="${lwjgl.src.templates}/org/lwjgl/openal"/>
-	<property name="lwjgl.src.templates.gl"                 location="${lwjgl.src.templates}/org/lwjgl/opengl"/>
-	<property name="lwjgl.src.templates.gles"               location="${lwjgl.src.templates}/org/lwjgl/opengles"/>
-	<property name="lwjgl.src.templates.cl"                 location="${lwjgl.src.templates}/org/lwjgl/opencl"/>
-
-	<property name="openal-template-pattern"        	    value="AL*.java,EFX*.java"/>
-	<property name="opengl-template-pattern"        	    value="GL*.java,ARB*.java,EXT*.java,KHR*.java,AMD*.java,APPLE*.java,ATI*.java,NV*.java,NVX*.java,HP*.java,IBM*.java,SUN*.java,SGIS*.java,GREMEDY*.java,INTEL*.java"/>
-	<property name="opengles-template-pattern"      	    value="GLES*.java,ARB*.java,EXT*.java,KHR*.java,AMD*.java,ANGLE*.java,APPLE*.java,ARM*.java,DMP*.java,IMG*.java,NV*.java,OES*.java,QCOM*.java,VIV*.java"/>
-    <property name="opencl-template-pattern-extensions"     value="KHR*.java,EXT*.java,APPLE*.java,AMD*.java,INTEL*.java,NV*.java"/>
-    <property name="opencl-template-pattern"        	    value="CL*.java,${opencl-template-pattern-extensions}"/>
-
-	<!-- ================================================================== -->
-	<!-- Filesets used for targets 																					-->
-	<!-- ================================================================== -->
-
-	<!-- Files to include in the lwjgl.jar file -->
-	<fileset id="lwjgl.fileset" dir="${lwjgl.target.gen.classes}">
-		<patternset id="lwjgl.package.pattern">
-			<include name="org/**/*" />
-			<exclude name="org/lwjgl/opengles/**"/>
-			<exclude name="org/lwjgl/d3d/**" />
-			<exclude name="org/lwjgl/test/**" />
-			<exclude name="org/lwjgl/util/**" />
-			<exclude name="org/lwjgl/examples/**" />
-		</patternset>
-	</fileset>
-	<fileset id="lwjgl.fileset.dependencies" dir="${lwjgl.target.gen.classes}">
-		<patternset id="lwjgl.package.dependencies.pattern">
-			<include name="org/lwjgl/opengles/ContextAttribs*.*"/>
-		</patternset>
-	</fileset>
-
-	<!-- Files to include in the lwjgl_test.jar file -->
-	<fileset id="lwjgl_test.fileset" dir="${lwjgl.target.gen.classes}">
-		<exclude name="**.*" />
-		<include name="org/lwjgl/test/**" />
-		<exclude name="org/lwjgl/test/opengles/**"/>
-		<include name="org/lwjgl/examples/**" />
-	</fileset>
-
-  <!-- More files to include in the lwjgl_test.jar file -->
-	<fileset id="lwjgl_test_extra.fileset" dir="${lwjgl.src}/java">
-		<exclude name="**.*" />
-		<include name="org/lwjgl/test/opengl/shaders/*.fp" />
-        <include name="org/lwjgl/test/opengl/shaders/*.vp" />
-        <include name="org/lwjgl/test/opengl/shaders/*.vsh" />
-        <include name="org/lwjgl/test/opengl/shaders/*.fsh" />
-        <include name="org/lwjgl/test/opencl/gl/*.cl" />
-	</fileset>
-
-	<!-- Files to include in the lwjgl_test.jar file for the ES build -->
-	<fileset id="lwjgl_test_es.fileset" dir="${lwjgl.target.gen.classes}">
-		<exclude name="**.*"/>
-		<include name="org/lwjgl/test/**"/>
-		<exclude name="org/lwjgl/test/opengl/**"/>
-		<exclude name="org/lwjgl/test/*.*"/>
-	</fileset>
-
-	<!-- Files to include in the lwjgl_util.jar file -->
-	<fileset id="lwjgl_util.fileset" dir="${lwjgl.target.gen.classes}">
-		<patternset id="lwjgl_util.package.pattern">
-			<exclude name="**.*" />
-			<exclude name="org/lwjgl/util/generator/**" />
-			<include name="org/lwjgl/util/**" />
-		</patternset>
-	</fileset>
-
-	<!-- Files to make Javadoc from -->
-	<fileset id="lwjgl.javadoc.fileset" dir="${lwjgl.src}">
-		<include name="**/*.java" />
-		<exclude name="native/**" />
-		<exclude name="templates/**" />
-		<exclude name="java/org/lwjgl/test/**" />
-		<exclude name="java/org/lwjgl/examples/**" />
-		<exclude name="java/org/lwjgl/util/generator/**" />
-	</fileset>
-
-	<!-- Files to include in doc package -->
-	<patternset id="lwjgl-docs.fileset">
-		<include name="CREDITS" />
-		<include name="LICENSE" />
-		<include name="README" />
-		<include name="lwjgl_hidden_switches.text" />
-		<include name="3rdparty/*" />
-	</patternset>
-
-	<!-- Files to include in windows package -->
-	<patternset id="lwjgl-windows.fileset">
-		<patternset id="lwjgl-windows-lwjgl.fileset">
-			<include name="lwjgl.dll" />
-			<include name="lwjgl64.dll" />
-			<include name="OpenAL32.dll" />
-			<include name="OpenAL64.dll" />
-		</patternset>
-		<patternset id="lwjgl-windows-jinput.fileset">
-	    	<include name="jinput-dx8*.dll" />
-	    	<include name="jinput-raw*.dll" />
-		</patternset>
-	</patternset>
-
-	<!-- Files to include in linux, glibc2.3 package -->
-	<patternset id="lwjgl-linux.fileset">
-		<patternset id="lwjgl-linux-lwjgl.fileset">
-			<include name="liblwjgl*.so" />
-			<include name="libopenal*.so" />
-		</patternset>
-		<patternset id="lwjgl-linux-jinput.fileset">
-			<include name="libjinput-linux.so" />
-			<include name="libjinput-linux64.so" />
-		</patternset>
-	</patternset>
-
-	<!-- Files to include in mac os x package -->
-	<patternset id="lwjgl-macosx.fileset">
-		<patternset id="lwjgl-macosx-lwjgl.fileset">
-			<include name="liblwjgl.dylib" />
-			<include name="openal.dylib" />
-		</patternset>
-		<patternset id="lwjgl-macosx-jinput.fileset">
-		    <include name="libjinput-osx.dylib" />
-		    <include name="libjinput-osx-legacy.dylib" />
-		</patternset>
-	</patternset>
-
-	<!-- Files to include in solaris package -->
-	<patternset id="lwjgl-solaris.fileset">
-		<include name="liblwjgl*.so" />
-		<include name="libopenal*.so" />
-	</patternset>
-
-	<!-- Files to include in source distribution -->
-	<fileset id="lwjgl.source.fileset" dir=".">
-        <include name="build.xml" />
-        <include name="src/**" />
-    	<include name="platform_build/**/*" />
-	</fileset>
-
-	<!-- files in the base package -->
-	<patternset id="lwjgl_base">
-		<include name="**" />
-		<exclude name="res/ILtest.*" />
-		<exclude name="res/Missing_you.mod" />
-		<exclude name="res/phero*.*" />
-	</patternset>
-
-	<!-- files in the optional package -->
-	<patternset id="lwjgl_optional">
-		<include name="res/**" />
-		<exclude name="res/logo/**" />
-		<exclude name="res/spaceinvaders/**" />
-		<exclude name="res/*.wav" />
-		<exclude name="res/*.xpm" />
-		<include name="doc/CREDITS" />
-		<include name="doc/LICENSE" />
-		<include name="doc/README" />
-	</patternset>
-
-	<uptodate property="lwjgl.main.built" targetfile="${lwjgl.target.natives}/lwjgl.dll" >
-	    <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/>
-	    <srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
-	</uptodate>
-</project>
+<project name="definitions" basedir="/dev/null">
+	<!-- ================================================================== -->
+	<!-- Global properties for build 										-->
+	<!-- ================================================================== -->
+	<property name="lwjgl.version"							value="2.9.4" />
+	<property name="lwjgl.web"								location="www" />
+	<property name="lwjgl.lib"								location="libs" />
+	<property name="lwjgl.target"							location="target" />
+
+	<!-- Intermediates -->
+	<property name="lwjgl.target.gen"						location="${lwjgl.target}/gen" />
+	<property name="lwjgl.target.gen.classes" 				location="${lwjgl.target.gen}/classes" />
+	<property name="lwjgl.target.gen.java" 					location="${lwjgl.target.gen}/java" />
+	<property name="lwjgl.target.gen.headers" 				location="${lwjgl.target.gen}/headers" />
+	<property name="lwjgl.target.gen.native" 				location="${lwjgl.target.gen}/native" />
+	<property name="lwjgl.target.gen.obj"					location="${lwjgl.target.gen}/obj" />
+	<property name="lwjgl.target.staging" 	 				location="${lwjgl.target}/staging" />
+
+	<!-- Artifacts -->
+	<property name="lwjgl.target.jars"						location="${lwjgl.target}/jars" />
+	<property name="lwjgl.target.natives"					location="${lwjgl.target}/natives" />
+	<property name="lwjgl.target.doc"						location="${lwjgl.target}/doc" />
+	<property name="lwjgl.target.bundle"					location="${lwjgl.target}/bundle" />
+
+	<!-- Sources -->
+	<property name="lwjgl.src"								location="src" />
+	<property name="lwjgl.src.java"							location="${lwjgl.src}/java" />
+	<property name="lwjgl.src.native"						location="${lwjgl.src}/native" />
+	<property name="lwjgl.src.templates"					location="${lwjgl.src}/templates" />
+	<property name="lwjgl.src.stubs"						location="${lwjgl.src}/stubs" />
+
+	<property name="lwjgl.src.templates.al"					location="${lwjgl.src.templates}/org/lwjgl/openal"/>
+	<property name="lwjgl.src.templates.gl"					location="${lwjgl.src.templates}/org/lwjgl/opengl"/>
+	<property name="lwjgl.src.templates.gles"				location="${lwjgl.src.templates}/org/lwjgl/opengles"/>
+	<property name="lwjgl.src.templates.cl"					location="${lwjgl.src.templates}/org/lwjgl/opencl"/>
+
+	<property name="openal-template-pattern"				value="AL*.java,EFX*.java"/>
+	<property name="opengl-template-pattern"				value="GL*.java,ARB*.java,EXT*.java,KHR*.java,AMD*.java,APPLE*.java,ATI*.java,NV*.java,NVX*.java,HP*.java,IBM*.java,SUN*.java,SGIS*.java,GREMEDY*.java,INTEL*.java"/>
+	<property name="opengles-template-pattern"				value="GLES*.java,ARB*.java,EXT*.java,KHR*.java,AMD*.java,ANGLE*.java,APPLE*.java,ARM*.java,DMP*.java,IMG*.java,NV*.java,OES*.java,QCOM*.java,VIV*.java"/>
+	<property name="opencl-template-pattern-extensions"		value="KHR*.java,EXT*.java,APPLE*.java,AMD*.java,INTEL*.java,NV*.java"/>
+	<property name="opencl-template-pattern"				value="CL*.java,${opencl-template-pattern-extensions}"/>
+
+	<!-- Compilers -->
+	<!-- Appears to be 25% faster than Clang -->
+	<property name="lwjgl.compiler.native.linux"			value="gcc"/>
+	<!--<property name="lwjgl.compiler.native.linux"			value="clang"/>-->
+
+	<!-- ================================================================== -->
+	<!-- Filesets used for targets 											-->
+	<!-- ================================================================== -->
+
+	<!-- Files to include in the lwjgl.jar file -->
+	<fileset id="lwjgl.fileset" dir="${lwjgl.target.gen.classes}">
+		<patternset id="lwjgl.package.pattern">
+			<include name="org/**/*" />
+			<exclude name="org/lwjgl/opengles/**"/>
+			<exclude name="org/lwjgl/d3d/**" />
+			<exclude name="org/lwjgl/test/**" />
+			<exclude name="org/lwjgl/util/**" />
+			<exclude name="org/lwjgl/examples/**" />
+		</patternset>
+	</fileset>
+	<fileset id="lwjgl.fileset.dependencies" dir="${lwjgl.target.gen.classes}">
+		<patternset id="lwjgl.package.dependencies.pattern">
+			<include name="org/lwjgl/opengles/ContextAttribs*.*"/>
+		</patternset>
+	</fileset>
+
+	<!-- Files to include in the lwjgl_test.jar file -->
+	<fileset id="lwjgl_test.fileset" dir="${lwjgl.target.gen.classes}">
+		<exclude name="**.*" />
+		<include name="org/lwjgl/test/**" />
+		<exclude name="org/lwjgl/test/opengles/**"/>
+		<include name="org/lwjgl/examples/**" />
+	</fileset>
+
+  <!-- More files to include in the lwjgl_test.jar file -->
+	<fileset id="lwjgl_test_extra.fileset" dir="${lwjgl.src}/java">
+		<exclude name="**.*" />
+		<include name="org/lwjgl/test/opengl/shaders/*.fp" />
+		<include name="org/lwjgl/test/opengl/shaders/*.vp" />
+		<include name="org/lwjgl/test/opengl/shaders/*.vsh" />
+		<include name="org/lwjgl/test/opengl/shaders/*.fsh" />
+		<include name="org/lwjgl/test/opencl/gl/*.cl" />
+	</fileset>
+
+	<!-- Files to include in the lwjgl_test.jar file for the ES build -->
+	<fileset id="lwjgl_test_es.fileset" dir="${lwjgl.target.gen.classes}">
+		<exclude name="**.*"/>
+		<include name="org/lwjgl/test/**"/>
+		<exclude name="org/lwjgl/test/opengl/**"/>
+		<exclude name="org/lwjgl/test/*.*"/>
+	</fileset>
+
+	<!-- Files to include in the lwjgl_util.jar file -->
+	<fileset id="lwjgl_util.fileset" dir="${lwjgl.target.gen.classes}">
+		<patternset id="lwjgl_util.package.pattern">
+			<exclude name="**.*" />
+			<exclude name="org/lwjgl/util/generator/**" />
+			<include name="org/lwjgl/util/**" />
+		</patternset>
+	</fileset>
+
+	<!-- Files to make Javadoc from -->
+	<fileset id="lwjgl.javadoc.fileset" dir="${lwjgl.src}">
+		<include name="**/*.java" />
+		<exclude name="native/**" />
+		<exclude name="templates/**" />
+		<exclude name="java/org/lwjgl/test/**" />
+		<exclude name="java/org/lwjgl/examples/**" />
+		<exclude name="java/org/lwjgl/util/generator/**" />
+	</fileset>
+
+	<!-- Files to include in doc package -->
+	<patternset id="lwjgl-docs.fileset">
+		<include name="CREDITS" />
+		<include name="LICENSE" />
+		<include name="README" />
+		<include name="lwjgl_hidden_switches.text" />
+		<include name="3rdparty/*" />
+	</patternset>
+
+	<!-- Files to include in windows package -->
+	<patternset id="lwjgl-windows.fileset">
+		<patternset id="lwjgl-windows-lwjgl.fileset">
+			<include name="lwjgl.dll" />
+			<include name="lwjgl64.dll" />
+			<include name="OpenAL32.dll" />
+			<include name="OpenAL64.dll" />
+		</patternset>
+		<patternset id="lwjgl-windows-jinput.fileset">
+			<include name="jinput-dx8*.dll" />
+			<include name="jinput-raw*.dll" />
+		</patternset>
+	</patternset>
+
+	<!-- Files to include in linux, glibc2.3 package -->
+	<patternset id="lwjgl-linux.fileset">
+		<patternset id="lwjgl-linux-lwjgl.fileset">
+			<include name="liblwjgl*.so" />
+			<include name="libopenal*.so" />
+		</patternset>
+		<patternset id="lwjgl-linux-jinput.fileset">
+			<include name="libjinput-linux.so" />
+			<include name="libjinput-linux64.so" />
+		</patternset>
+	</patternset>
+
+	<!-- Files to include in mac os x package -->
+	<patternset id="lwjgl-macosx.fileset">
+		<patternset id="lwjgl-macosx-lwjgl.fileset">
+			<include name="liblwjgl.dylib" />
+			<include name="openal.dylib" />
+		</patternset>
+		<patternset id="lwjgl-macosx-jinput.fileset">
+			<include name="libjinput-osx.dylib" />
+			<include name="libjinput-osx-legacy.dylib" />
+		</patternset>
+	</patternset>
+
+	<!-- Files to include in solaris package -->
+	<patternset id="lwjgl-solaris.fileset">
+		<include name="liblwjgl*.so" />
+		<include name="libopenal*.so" />
+	</patternset>
+
+	<!-- Files to include in source distribution -->
+	<fileset id="lwjgl.source.fileset" dir=".">
+		<include name="build.xml" />
+		<include name="src/**" />
+		<include name="platform_build/**/*" />
+	</fileset>
+
+	<!-- files in the base package -->
+	<patternset id="lwjgl_base">
+		<include name="**" />
+		<exclude name="res/ILtest.*" />
+		<exclude name="res/Missing_you.mod" />
+		<exclude name="res/phero*.*" />
+	</patternset>
+
+	<!-- files in the optional package -->
+	<patternset id="lwjgl_optional">
+		<include name="res/**" />
+		<exclude name="res/logo/**" />
+		<exclude name="res/spaceinvaders/**" />
+		<exclude name="res/*.wav" />
+		<exclude name="res/*.xpm" />
+		<include name="doc/CREDITS" />
+		<include name="doc/LICENSE" />
+		<include name="doc/README" />
+	</patternset>
+
+	<uptodate property="lwjgl.main.built" targetfile="${lwjgl.target.natives}/lwjgl.dll" >
+		<srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/>
+		<srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
+	</uptodate>
+</project>
diff --git a/platform_build/linux_ant/build.xml b/platform_build/linux_ant/build.xml
index 6d010e5f..ab2895c1 100644
--- a/platform_build/linux_ant/build.xml
+++ b/platform_build/linux_ant/build.xml
@@ -7,7 +7,7 @@
 	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib -L${java.home}/lib/amd64 -ljawt" />
 	<property name="cflags32" value="-O3 -Wall -c -fPIC -std=c99 -Wunused"/>
 
-    <target name="compile">
+	<target name="compile">
 		<exec executable="uname" outputproperty="hwplatform">
 			<arg value="-m"/>
 		</exec>
@@ -22,37 +22,37 @@
 				<os name="SunOS" />
 			</and>
 		</condition>
-    	<condition property="cflags64" value="-O3 -m64 -Wall -c -fPIC -std=c99 -Wunused" else="-O3 -Wall -c -fPIC -std=c99 -Wunused">
-    		<os name="SunOS" />
-    	</condition>
+		<condition property="cflags64" value="-O3 -m64 -Wall -c -fPIC -std=c99 -Wunused" else="-O3 -Wall -c -fPIC -std=c99 -Wunused">
+			<os name="SunOS" />
+		</condition>
 
 		<property name="linker_flags32" value="${version_script_flags32} -shared -O3 -Wall -o ${libname32} ${libs32}"/>
 		<property name="linker_flags64" value="${version_script_flags64} -shared -O3 -Wall -o ${libname64} ${libs64}"/>
 
-    	<condition property="build.32bit.only">
-    		<not>
-	    		<or>
+		<condition property="build.32bit.only">
+			<not>
+				<or>
 					<equals arg1="${hwplatform}" arg2="x86_64"/>
 					<equals arg1="${hwplatform}" arg2="i86pc"/>
 				</or>
-    		</not>
-    	</condition>
+			</not>
+		</condition>
 
-    	<!-- On linux, the 64 bit jre doesn't have the 32 bit libs -->
-    	<condition property="build.64bit.only">
-    		<and>
-    			<os name="Linux"/>
-    			<equals arg1="${hwplatform}" arg2="x86_64"/>
-    		</and>
-    	</condition>
+		<!-- On linux, the 64 bit jre doesn't have the 32 bit libs -->
+		<condition property="build.64bit.only">
+			<and>
+				<os name="Linux"/>
+				<equals arg1="${hwplatform}" arg2="x86_64"/>
+			</and>
+		</condition>
 
-    	<antcall target="compile32"/>
-    	<antcall target="compile64"/>
-    </target>
+		<antcall target="compile32"/>
+		<antcall target="compile64"/>
+	</target>
 
-    <target name="compile32" unless="build.64bit.only">
-    	<mkdir dir="${lwjgl.target.gen.obj}/i386"/>
-    	<apply dir="${lwjgl.target.gen.obj}/i386" executable="gcc" failonerror="true" parallel="true">
+	<target name="compile32" unless="build.64bit.only">
+		<mkdir dir="${lwjgl.target.gen.obj}/i386"/>
+		<apply dir="${lwjgl.target.gen.obj}/i386" executable="${lwjgl.compiler.native.linux}" failonerror="true" parallel="true">
 			<arg line="${cflags32} ${cflags_pthread}"/>
 			<arg value="-I${java.home}/include"/>
 			<arg value="-I${java.home}/include/linux"/>
@@ -60,20 +60,20 @@
 			<arg value="-I${java.home}/../include/linux"/>
 			<arg value="-I${java.home}/../include/solaris"/>
 			<arg value="-I${lwjgl.src.native}/common"/>
-		    <arg value="-I${lwjgl.src.native}/common/opengl"/>
+			<arg value="-I${lwjgl.src.native}/common/opengl"/>
 			<arg value="-I${lwjgl.src.native}/linux"/>
-		    <arg value="-I${lwjgl.src.native}/linux/opengl"/>
-		    <arg value="-I${lwjgl.target.gen.headers}"/>
+			<arg value="-I${lwjgl.src.native}/linux/opengl"/>
+			<arg value="-I${lwjgl.target.gen.headers}"/>
 			<mapper type="glob" from="*.c" to="*.o"/>
-		    <fileset dir="${lwjgl.src.native}/common" includes="*.c"/>
-		    <fileset dir="${lwjgl.src.native}/common/opengl" includes="*.c"/>
-		    <fileset dir="${lwjgl.target.gen.native}/openal" includes="*.c"/>
-		    <fileset dir="${lwjgl.target.gen.native}/opencl" includes="*.c"/>
-		    <fileset dir="${lwjgl.target.gen.native}/opengl" includes="*.c"/>
-		    <fileset dir="${lwjgl.src.native}/linux" includes="*.c"/>
-		    <fileset dir="${lwjgl.src.native}/linux/opengl" includes="*.c"/>
-	    </apply>
-		<apply dir="${lwjgl.target.natives}" parallel="true" executable="gcc" failonerror="true">
+			<fileset dir="${lwjgl.src.native}/common" includes="*.c"/>
+			<fileset dir="${lwjgl.src.native}/common/opengl" includes="*.c"/>
+			<fileset dir="${lwjgl.target.gen.native}/openal" includes="*.c"/>
+			<fileset dir="${lwjgl.target.gen.native}/opencl" includes="*.c"/>
+			<fileset dir="${lwjgl.target.gen.native}/opengl" includes="*.c"/>
+			<fileset dir="${lwjgl.src.native}/linux" includes="*.c"/>
+			<fileset dir="${lwjgl.src.native}/linux/opengl" includes="*.c"/>
+		</apply>
+		<apply dir="${lwjgl.target.natives}" parallel="true" executable="${lwjgl.compiler.native.linux}" failonerror="true">
 			<srcfile/>
 			<arg line="${linker_flags32}"/>
 			<fileset dir="${lwjgl.target.gen.obj}/i386" includes="*.o"/>
@@ -81,11 +81,11 @@
 		<apply dir="${lwjgl.target.natives}" parallel="true" executable="strip" failonerror="true">
 			<fileset file="${libname32}"/>
 		</apply>
-    </target>
+	</target>
 
-    <target name="compile64" unless="build.32bit.only">
-        <mkdir dir="${lwjgl.target.gen.obj}/x86_64"/>
-    	<apply dir="${lwjgl.target.gen.obj}/x86_64" executable="gcc" failonerror="true" parallel="true">
+	<target name="compile64" unless="build.32bit.only">
+		<mkdir dir="${lwjgl.target.gen.obj}/x86_64"/>
+		<apply dir="${lwjgl.target.gen.obj}/x86_64" executable="${lwjgl.compiler.native.linux}" failonerror="true" parallel="true">
 			<arg line="${cflags64} ${cflags_pthread}"/>
 			<arg value="-I${java.home}/include"/>
 			<arg value="-I${java.home}/include/linux"/>
@@ -93,20 +93,20 @@
 			<arg value="-I${java.home}/../include/linux"/>
 			<arg value="-I${java.home}/../include/solaris"/>
 			<arg value="-I${lwjgl.src.native}/common"/>
-		    <arg value="-I${lwjgl.src.native}/common/opengl"/>
+			<arg value="-I${lwjgl.src.native}/common/opengl"/>
 			<arg value="-I${lwjgl.src.native}/linux"/>
-		    <arg value="-I${lwjgl.src.native}/linux/opengl"/>
-		    <arg value="-I${lwjgl.target.gen.headers}"/>
+			<arg value="-I${lwjgl.src.native}/linux/opengl"/>
+			<arg value="-I${lwjgl.target.gen.headers}"/>
 			<mapper type="glob" from="*.c" to="*.o"/>
-		    <fileset dir="${lwjgl.src.native}/common" includes="*.c"/>
-		    <fileset dir="${lwjgl.src.native}/common/opengl" includes="*.c"/>
-		    <fileset dir="${lwjgl.target.gen.native}/openal" includes="*.c"/>
-		    <fileset dir="${lwjgl.target.gen.native}/opencl" includes="*.c"/>    		
-		    <fileset dir="${lwjgl.target.gen.native}/opengl" includes="*.c"/>
-		    <fileset dir="${lwjgl.src.native}/linux" includes="*.c"/>
-		    <fileset dir="${lwjgl.src.native}/linux/opengl" includes="*.c"/>
-	    </apply>
-		<apply dir="${lwjgl.target.natives}" parallel="true" executable="gcc" failonerror="true">
+			<fileset dir="${lwjgl.src.native}/common" includes="*.c"/>
+			<fileset dir="${lwjgl.src.native}/common/opengl" includes="*.c"/>
+			<fileset dir="${lwjgl.target.gen.native}/openal" includes="*.c"/>
+			<fileset dir="${lwjgl.target.gen.native}/opencl" includes="*.c"/>
+			<fileset dir="${lwjgl.target.gen.native}/opengl" includes="*.c"/>
+			<fileset dir="${lwjgl.src.native}/linux" includes="*.c"/>
+			<fileset dir="${lwjgl.src.native}/linux/opengl" includes="*.c"/>
+		</apply>
+		<apply dir="${lwjgl.target.natives}" parallel="true" executable="${lwjgl.compiler.native.linux}" failonerror="true">
 			<srcfile/>
 			<arg line="${linker_flags64}"/>
 			<fileset dir="${lwjgl.target.gen.obj}/x86_64" includes="*.o"/>
@@ -114,5 +114,5 @@
 		<apply dir="${lwjgl.target.natives}" parallel="true" executable="strip" failonerror="true">
 			<fileset file="${lwjgl.target.natives}/${libname64}"/>
 		</apply>
-    </target>
+	</target>
 </project>