From ffd4f4b39f0600a0432728ab00d20c9127200196 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 25 Mar 2010 13:15:04 +0100
Subject: relocated lib/gluegen.compiler.linux-32bit.xml to gluegen

---
 make/lib/gluegen.compiler.linux-32bit.xml | 31 -------------------------------
 make/make.jogl.all.linux-x86.sh           |  2 +-
 make/make.jogl.cdcfp.linux-x86.sh         |  2 +-
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 make/lib/gluegen.compiler.linux-32bit.xml

(limited to 'make')

diff --git a/make/lib/gluegen.compiler.linux-32bit.xml b/make/lib/gluegen.compiler.linux-32bit.xml
deleted file mode 100644
index 344d9da27..000000000
--- a/make/lib/gluegen.compiler.linux-32bit.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    This is an example of how to add custom compiler/linker 
-    arguments for a crosscompiler.
-
-    You can use such files with setting the property 'gluegen.user.compiler.file', ie:
-
-        -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.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">
-    <compiler id="compiler.cfg.linux" name="gcc">
-      <compilerarg value="-m32" />
-      <compilerarg value="-Wall" />
-      <defineset>
-        <define name="LINUX" />
-      </defineset>
-    </compiler>
-
-    <linker id="linker.cfg.linux" name="gcc">
-      <linkerarg value="-m32" />
-    </linker>
-</target>
-</project>
diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh
index 5387cf97a..ef12088ff 100644
--- a/make/make.jogl.all.linux-x86.sh
+++ b/make/make.jogl.all.linux-x86.sh
@@ -17,7 +17,7 @@ fi
 #    -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
 
 ant \
-    -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.linux-32bit.xml \
+    -Dgluegen.user.compiler.file=`pwd`/../../gluegen/make/lib/gluegen.compiler.linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \
     -Drootrel.build=build-x86 \
diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh
index d212bd81d..4f51136fb 100644
--- a/make/make.jogl.cdcfp.linux-x86.sh
+++ b/make/make.jogl.cdcfp.linux-x86.sh
@@ -15,7 +15,7 @@ fi
 BUILD_SUBDIR=build-cdcfp-x86
 
 ant -v \
-    -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.linux-32bit.xml \
+    -Dgluegen.user.compiler.file=`pwd`/../../gluegen/make/lib/gluegen.compiler.linux-32bit.xml \
     -Dbuild.noarchives=true \
     -Drootrel.build=$BUILD_SUBDIR \
     -Dsetup.cdcfp=true \
-- 
cgit v1.2.3