summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2005-04-24 00:42:48 +0000
committerKenneth Russel <[email protected]>2005-04-24 00:42:48 +0000
commit24c5dd419e8094b030a55ea86acee4dce0c61f06 (patch)
tree43e91a0a9b95e007ac98264e8723b6f41bd8350e /make
parentbafff33544dae0f28a0a7141d2a4ee05295ea2ec (diff)
Fixed Issue 156: Patch to add linux.ia64 target
Applied patch from submitter. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@261 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make')
-rw-r--r--make/build.xml26
1 files changed, 25 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml
index 7ce104390..604c33849 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -202,6 +202,7 @@
<property name="java.lib.dir.win32" value="${java.home.dir}/lib" />
<property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />
<property name="java.lib.dir.linux.amd64" value="${java.home.dir}/jre/lib/amd64" />
+ <property name="java.lib.dir.linux.ia64" value="${java.home.dir}/jre/lib/ia64" />
<condition property="cpu" value="sparc">
<os name="SunOS" arch="sparc" />
</condition>
@@ -321,6 +322,15 @@
<property name="linker.cfg.id" value="linker.cfg.linux.amd64" />
</target>
+ <target name="declare.linux.ia64" depends="declare.x11">
+ <property name="java.includes.dir.platform" value="${java.includes.dir.linux}" />
+ <property name="java.lib.dir.platform" value="${java.lib.dir.linux.ia64}" />
+
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux" />
+ </target>
+
+
<target name="declare.freebsd" depends="declare.x11">
<property name="java.includes.dir.platform" value="${java.includes.dir.freebsd}" />
<property name="java.lib.dir.platform" value="${java.lib.dir.linux}" />
@@ -877,6 +887,9 @@
<target name="c.compile.jogl.linux.amd64" depends="declare.linux.amd64, c.build.jogl, c.build.cg" >
</target>
+ <target name="c.compile.jogl.linux.ia64" depends="declare.linux.ia64, c.build.jogl, c.build.cg" >
+ </target>
+
<target name="c.compile.jogl.solaris" depends="declare.solaris, c.build.jogl">
</target>
@@ -1036,7 +1049,7 @@
<target name="all">
<fail>
-Use a platform specific target: linux, linux.amd64, macosx, solaris, win32.vc6, win32.vc7, win32.mingw
+Use a platform specific target: linux, linux.amd64, linux.ia64, macosx, solaris, win32.vc6, win32.vc7, win32.mingw
</fail>
</target>
@@ -1095,6 +1108,17 @@ Use a platform specific target: linux, linux.amd64, macosx, solaris, win32.vc6,
<antcall target="c.compile.jogl.linux.amd64" />
</target>
+ <!--
+ - Linux on IA64 (assuming GCC)
+ -->
+ <target name="linux.ia64" depends="setup.java.home.dir.nonmacosx, declare.linux.ia64">
+ <!-- Generate, compile, and build the jar for the Java sources. -->
+ <antcall target="jar" inheritRefs="true" />
+
+ <!-- Compile the native C sources and build the jogl lib. -->
+ <antcall target="c.compile.jogl.linux.ia64" />
+ </target>
+
<!--
- Solaris (assuming Solaris CC)
-->