michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Configurable compiler on linux, dos2unix on a file, consistent indentation

This commit is contained in:
Michael Pfaff 2023-06-25 18:35:37 -04:00
parent 92d2a63abc
commit c0b72342e6
Signed by: michael
GPG Key ID: CF402C4A012AA9D4
2 changed files with 249 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform_build/build-definitions.xml
View File

@ -40,6 +40,11 @@
<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 -->
<!-- ================================================================== -->

8
platform_build/linux_ant/build.xml
View File

@ -52,7 +52,7 @@
<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">
<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"/>
@ -73,7 +73,7 @@
<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">
<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"/>
@ -85,7 +85,7 @@
<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">
<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"/>
@ -106,7 +106,7 @@
<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">
<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"/>