summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--make/build-common.xml3
-rw-r--r--make/build-jogl.xml43
-rw-r--r--make/build-nativewindow.xml31
-rw-r--r--make/build-newt.xml39
4 files changed, 98 insertions, 18 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index 454e5d1aa..b0759f3a4 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -127,6 +127,9 @@
<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
<istrue value="${isLinuxX86}" />
</condition>
+ <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+ <istrue value="${isLinuxARMv7}" /> <!-- FIXME JAU .. hack -->
+ </condition>
<condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar">
<and>
<istrue value="${isOSX}" />
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">
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index da32f1809..8428dd88d 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -333,12 +333,19 @@
<target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
<!-- compiler configuration -->
+
<!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
<compiler id="compiler.cfg.freebsd.nativewindow" extends="compiler.cfg.freebsd">
<!-- Need to force X11R6 headers on to include path after stub_includes -->
<includepath path="/usr/local/include" />
</compiler>
+ <compiler id="compiler.cfg.linux.armv7.nativewindow.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.nativewindow.x11" extends="linker.cfg.freebsd">
@@ -359,12 +366,24 @@
<syslibset libs="Xinerama"/>
</linker>
+ <linker id="linker.cfg.linux.x86.nativewindow.x11" extends="linker.cfg.linux.x86">
+ <syslibset libs="X11"/>
+ <syslibset libs="Xxf86vm" />
+ <syslibset libs="Xinerama"/>
+ </linker>
+
<linker id="linker.cfg.linux.amd64.nativewindow.x11" extends="linker.cfg.linux.amd64">
<syslibset libs="X11"/>
<syslibset libs="Xxf86vm" />
<syslibset libs="Xinerama"/>
</linker>
+ <linker id="linker.cfg.linux.armv7.nativewindow.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" />
+ <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xinerama"/>
+ </linker>
+
<linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
<syslibset libs="X11"/>
</linker>
@@ -422,8 +441,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.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.x86" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.x86.nativewindow.x11" />
</target>
<target name="c.configure.linux.amd64" if="isLinuxAMD64">
@@ -432,13 +451,19 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" />
</target>
+ <target name="c.configure.linux.armv7" if="isLinuxARMv7">
+ <echo message="Linux.armv7" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7.nativewindow.x11" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv7.nativewindow.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.oswin" value="linker.cfg.linux.nativewindow.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" />
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 178824f01..5c12965d6 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -219,6 +219,12 @@
<includepath path="/usr/local/include" />
</compiler>
+ <compiler id="compiler.cfg.linux.armv7.newt.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.newt.x11" extends="linker.cfg.freebsd">
@@ -244,12 +250,24 @@
<syslibset libs="Xxf86vm" />
</linker>
+ <linker id="linker.cfg.linux.x86.newt.x11" extends="linker.cfg.linux.x86">
+ <syslibset libs="X11"/>
+ <syslibset libs="Xrandr"/>
+ <syslibset libs="Xxf86vm" />
+ </linker>
+
<linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64">
<syslibset libs="X11"/>
<syslibset libs="Xrandr"/>
<syslibset libs="Xxf86vm" />
</linker>
+ <linker id="linker.cfg.linux.armv7.newt.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="Xrandr"/>
+ <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xxf86vm" />
+ </linker>
+
<linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
<syslibset libs="X11"/>
</linker>
@@ -309,10 +327,10 @@
<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.core" value="linker.cfg.linux" />
- <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
- else="linker.cfg.linux">
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.x86" />
+ <property name="linker.cfg.id.core" value="linker.cfg.linux.x86" />
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.x86.newt.x11"
+ else="linker.cfg.linux.x86">
<isset property="isX11" />
</condition>
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
@@ -329,6 +347,17 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
+ <target name="c.configure.linux.armv7" if="isLinuxARMv7">
+ <echo message="Linux.armv7" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7.newt.x11" />
+ <property name="linker.cfg.id.core" value="linker.cfg.linux.armv7" />
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv7.newt.x11"
+ else="linker.cfg.linux.armv7">
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
<target name="c.configure.linux.ia64" if="isLinuxIA64">
<echo message="Linux.IA64" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -336,7 +365,7 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.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.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
<target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
<echo message="Solaris" />
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 03:40:50 +0000