diff options
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 64609fb13..8e522a320 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1035,7 +1035,14 @@ <target name="java.compile.thirdpass" depends="java.generate.composable.pipeline.custom, java.compile.thirdpass.javase" /> - <target name="java.compile" depends="java.compile.firstpass,java.compile.secondpass,java.compile.thirdpass" /> + <target name="java.compile" depends="java.compile.firstpass,java.compile.secondpass,java.compile.thirdpass"> + <!-- make shadercode and fonts available in classpath --> + <copy todir="${classes}"> + <fileset dir="${src.java}" + includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}" + excludes="**/*.java"/> + </copy> + </target> <!-- ================================================================== --> <!-- @@ -1052,6 +1059,12 @@ <includepath path="/usr/local/include" /> </compiler> + <compiler id="compiler.cfg.linux.armv7.jogl.x11" extends="compiler.cfg.linux.armv7"> + <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> + <compilerarg value="-idirafter" /> + <compilerarg value="/usr/include" /> + </compiler> + <!-- linker configuration --> <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd"> @@ -1069,11 +1082,21 @@ <syslibset libs="Xxf86vm" /> </linker> + <linker id="linker.cfg.linux.x86.jogl.x11" extends="linker.cfg.linux.x86"> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> + </linker> + <linker id="linker.cfg.linux.amd64.jogl.x11" extends="linker.cfg.linux.amd64"> <syslibset libs="X11"/> <syslibset libs="Xxf86vm" /> </linker> + <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7"> + <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="X11"/> + <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xxf86vm" /> + </linker> + <linker id="linker.cfg.solaris.jogl.x11" extends="linker.cfg.solaris"> <syslibset libs="X11"/> </linker> @@ -1142,8 +1165,8 @@ <target name="c.configure.linux.x86" if="isLinuxX86"> <echo message="Linux.x86" /> - <property name="compiler.cfg.id" value="compiler.cfg.linux" /> - <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.x86" /> + <property name="linker.cfg.id.os" value="linker.cfg.linux.x86.jogl.x11" /> </target> <target name="c.configure.linux.amd64" if="isLinuxAMD64"> @@ -1152,13 +1175,19 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" /> </target> + <target name="c.configure.linux.armv7" if="isLinuxARMv7"> + <echo message="Linux.armv7" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7.jogl.x11" /> + <property name="linker.cfg.id.os" value="linker.cfg.linux.armv7.jogl.x11" /> + </target> + <target name="c.configure.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> - <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" /> + <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" /> <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit"> <echo message="Solaris" /> @@ -1512,13 +1541,7 @@ <include name="jogamp/opengl/**" /> <include name="jogamp/graph/**" /> </fileset> - <fileset dir="${src.java}" - includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> </jar> - <copy todir="${classes}"> - <fileset dir="${src.java}" - includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> - </copy> </target> <target name="build-jars-all-noawt-javase" depends="setup-manifestfile"> <jar manifest="${build.jogl}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true"> |