From c4cd0db6b9865c97245921d2824bcc4c1541e615 Mon Sep 17 00:00:00 2001
From: Kenneth Russel <kbrussel@alum.mit.edu>
Date: Thu, 19 Mar 2009 00:32:21 +0000
Subject: Movement of Capabilities class and chooseCapabilities functionality
 into NativeWindowFactory introduced an undesirable dependence between the
 windowing toolkit, which can be replaced via NativeWindowFactory, and the
 library which implements the selection algorithm, for example OpenGL. This
 would prevent, for example, an easy SWT port of JOGL.

To fix this, refactored chooseCapabilities into new
GraphicsConfigurationFactory, the default implementation of which is
currently a no-op on X11 platforms, and which is provided by JOGL in a
toolkit-agnostic manner via GLX. Refactored OpenGL portions of
Capabilities class back into GLCapabilities. Reintroduced
GLCapabilitiesChooser interface for compatibility and to avoid having
to import javax.media.nativewindow classes in most user code.

Fixed problem in GLProfile where failures to load native libraries
were being squelched. Reorganized build to have all outputs under
build/ directory.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1884 232f8b59-042b-4e1e-8c03-345bb8c30851
---
 make/build-jogl.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index bcb930b05..79fdb06e2 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -336,7 +336,7 @@
               <isset property="rootrel.build"/>
           </not>
         </condition>
-        <property name="rootrel.build.jogl" value="${rootrel.build}-jogl" />
+        <property name="rootrel.build.jogl" value="${rootrel.build}/jogl" />
         <property name="rootrel.src.java" value="src/jogl/classes" />
         <property name="rootrel.src.c" value="src/jogl/native" />
         <property name="rootrel.src.c.openmax" value="src/jogl/native/openmax" />
@@ -355,13 +355,13 @@
         <property name="gluegen.build.xml" value="${gluegen.make.dir}/build.xml" />
         <property name="gluegen.jar" value="../../gluegen/${rootrel.build}/gluegen.jar" />
         <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" />
-        <property name="nativewindow.all.jar" value="../${rootrel.build}-nativewindow/nativewindow.all.jar" />
+        <property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" />
                                                 
         <!-- The source directories. -->
         <property name="src.java" value="${project.root}/${rootrel.src.java}" />
         <property name="src.c"    value="${project.root}/${rootrel.src.c}" />
         <property name="build"    value="${project.root}/${rootrel.build.jogl}" />
-        <property name="tempdir"  value="${project.root}/build-temp" />
+        <property name="tempdir"  value="${build}/temp" />
         
         <!-- The generated source directories. -->
         <property name="src.generated" value="${build}/gensrc" />
-- 
cgit v1.2.3