aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-jogl.xml5
-rw-r--r--make/build-nativewindow.xml5
-rw-r--r--make/build-newt.xml19
-rw-r--r--make/lib/gluegen.compiler.intelgdl.xml42
4 files changed, 53 insertions, 18 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 64e5cf93a..bf07499a6 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -68,9 +68,6 @@
<property name="gluegen.root" value="../../gluegen" />
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
- <available file="${user.home}/jogl.compiler.xml" property="jogl.compiler.present"/>
- <import file="${user.home}/jogl.compiler.xml" optional="true" />
-
<!-- ================================================================== -->
<!--
- Base initialization and detection of operating system.
@@ -1198,7 +1195,7 @@
- Compile the native C code for JOGL (and optionally the Cg binding).
-->
- <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler" unless="jogl.compiler.present">
+ <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 -->
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index ce7081464..2e3c431ec 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -59,9 +59,6 @@
<property name="gluegen.root" value="../../gluegen" />
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
- <available file="${user.home}/nativewindow.compiler.xml" property="nwi.compiler.present"/>
- <import file="${user.home}/nativewindow.compiler.xml" optional="true" />
-
<!-- ================================================================== -->
<!--
- Base initialization and detection of operating system.
@@ -473,7 +470,7 @@
- Compile the native C code for JOGL (and optionally the Cg binding).
-->
- <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler" unless="nativewindow.compiler.present">
+ <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 -->
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 48674f1ac..ad04973e4 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -62,9 +62,6 @@
<property name="gluegen.root" value="../../gluegen" />
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
- <available file="${user.home}/newt.compiler.xml" property="newt.compiler.present"/>
- <import file="${user.home}/newt.compiler.xml" optional="true" />
-
<!-- ================================================================== -->
<!--
- Base initialization and detection of operating system.
@@ -349,7 +346,7 @@
- Compile the native C code for JOGL (and optionally the Cg binding).
-->
- <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler" unless="newt.compiler.present">
+ <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 -->
@@ -424,12 +421,10 @@
<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" >
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
+ else="linker.cfg.linux">
<isset property="isX11" />
</condition>
- <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.broadcom_egl" >
- <isset property="useBroadcomEGL" />
- </condition>
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
@@ -437,7 +432,11 @@
<echo message="Linux.AMD64" />
<property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" />
<property name="linker.cfg.id.core" value="linker.cfg.linux.amd64" />
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.newt.x11" />
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.newt.x11"
+ else="linker.cfg.linux.amd64">
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
<target name="c.configure.linux.ia64" if="isLinuxIA64">
@@ -447,7 +446,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.ia64,c.configure.x11" if="isLinux"/>
<target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
<echo message="Solaris" />
diff --git a/make/lib/gluegen.compiler.intelgdl.xml b/make/lib/gluegen.compiler.intelgdl.xml
new file mode 100644
index 000000000..d0a1c50e2
--- /dev/null
+++ b/make/lib/gluegen.compiler.intelgdl.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ This is an example of how to add custom compiler/linker arguments
+ for a crosscompiler and a custom NEWT windowing implementation.
+
+ You can use such files with setting the property 'gluegen.user.compiler.file', ie:
+
+ -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.intelgdl.xml
+
+ or by having such file in your home directory, ie:
+
+ ~/gluegen.compiler.xml
+ -->
+
+<project name="GlueGen-cpptasks" basedir=".">
+ <target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
+ <linker id="linker.cfg.linux" name="gcc">
+ <linkerarg value="-m32" />
+ <linkerarg value="-L/usr/lib" />
+ <linkerarg value="-L../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" />
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="gdl"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="srv_um"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="osal"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="GLESv2"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="IMGegl"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="EGL"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="GLES_CM"/>
+ </linker>
+ <linker id="linker.cfg.linux.amd64" name="gcc">
+ <linkerarg value="-L/usr/lib64" />
+ <linkerarg value="-L../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" />
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="gdl"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="srv_um"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="osal"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="GLESv2"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="IMGegl"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="EGL"/>
+ <syslibset dir="../../import/crossroots.intel-ce3100-x86-libs-1.0/nfsroot.intel-ce3110-x86-glibc/i686-linux-elf/lib" libs="GLES_CM"/>
+ </linker>
+ </target>
+</project>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 06:44:55 +0000