From 94c4ef007321f24177b32174d1ab24c91271da1f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 22 Apr 2010 16:19:34 +0200
Subject: Migrating gl2/gl3/gl4 -> gldesktop. Use JOGL_GLDESKTOP_.. when using
 profile.jogl script

---
 make/build-common.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'make/build-common.xml')

diff --git a/make/build-common.xml b/make/build-common.xml
index ccbf56fd6..cc40a5cd4 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -4,6 +4,14 @@
 
     <description>Common JOGL Stuff</description>
 
+    <fail message="Please build using Ant 1.8.0 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.8.0"/>
+            </not>
+        </condition>
+    </fail>
+
     <!-- Pull in GlueGen cpptasks build file -->
     <property name="gluegen.root" value="../../gluegen" />
     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
@@ -254,7 +262,7 @@
         <property name="jogl.egl.jar"                   value="${build.jogl}/jogl.egl.jar" />
         <property name="jogl.glutess.jar"               value="${build.jogl}/jogl.glu.tess.jar" />
         <property name="jogl.glumipmap.jar"             value="${build.jogl}/jogl.glu.mipmap.jar" />
-        <property name="jogl.glugl2.jar"                value="${build.jogl}/jogl.glu.gl2.jar" />
+        <property name="jogl.glugldesktop.jar"                value="${build.jogl}/jogl.glu.gldesktop.jar" />
 
         <property name="jogl.os.x11.jar"                value="${build.jogl}/jogl.os.x11.jar" />
         <property name="jogl.os.win.jar"                value="${build.jogl}/jogl.os.win.jar" />
@@ -262,20 +270,14 @@
 
         <property name="jogl.gl2es12.jar"               value="${build.jogl}/jogl.gl2es12.jar" />
 
-        <property name="jogl.gl2.jar"                   value="${build.jogl}/jogl.gl2.jar" />
-        <property name="jogl.gl2.dbg.jar"               value="${build.jogl}/jogl.gl2.dbg.jar" />
-
-        <property name="jogl.gl3.jar"                   value="${build.jogl}/jogl.gl3.jar" />
-        <property name="jogl.gl3.dbg.jar"               value="${build.jogl}/jogl.gl3.dbg.jar" />
-
-        <property name="jogl.gl4.jar"                   value="${build.jogl}/jogl.gl4.jar" />
-        <property name="jogl.gl4.dbg.jar"               value="${build.jogl}/jogl.gl4.dbg.jar" />
+        <property name="jogl.gldesktop.jar"             value="${build.jogl}/jogl.gldesktop.jar" />
+        <property name="jogl.gldesktop.dbg.jar"         value="${build.jogl}/jogl.gldesktop.dbg.jar" />
 
         <property name="jogl.omx.jar"                   value="${build.jogl}/jogl.omx.jar" />
 
         <property name="jogl.awt.jar"                   value="${build.jogl}/jogl.awt.jar" />
         <property name="jogl.util.jar"                  value="${build.jogl}/jogl.util.jar" />
-        <property name="jogl.util.gl2.jar"              value="${build.jogl}/jogl.util.gl2.jar" />
+        <property name="jogl.util.gldesktop.jar"              value="${build.jogl}/jogl.util.gldesktop.jar" />
         <property name="jogl.util.awt.jar"              value="${build.jogl}/jogl.util.awt.jar" />
         <property name="jogl.util.fixedfuncemu.jar"     value="${build.jogl}/jogl.util.fixedfuncemu.jar" />
         <property name="jogl.sdk.jar"                   value="${build.jogl}/jogl.sdk.jar" />
-- 
cgit v1.2.3