Added Ant build support, contributed by Rob Grzywinski and Artur

Biesiadowski. Modified their original build.xml to understand
dependencies between build phases (to avoid full rebuilds each time)
and to invoke the C compiler without requiring an external Makefile.
At this point the old Makefile/Makefile2 pair is obsolete and will be
deleted shortly, as soon as the Ant build has been tested on Linux and
Mac OS X. Additionally, Cygwin is no longer needed for the build; the
documentation will be updated to reflect this. Refactored some of the
stub_includes files to be common between platforms, yielding a build
process cleanup. Fixed bugs in Javadocs.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@19 232f8b59-042b-4e1e-8c03-345bb8c30851

5 files changed, 61 insertions, 0 deletions

diff --git a/make/stub_includes/common/cg.c b/make/stub_includes/common/cg.c
new file mode 100644
index 000000000..98c824285
--- /dev/null
+++ b/make/stub_includes/common/cg.c
@@ -0,0 +1,26 @@
+// Define __gl_h_ so that GL/gl.h doesn't get bound as part of CgGL.java
+// because cgGL.h tries to include it
+#define __gl_h_
+
+// Define some types so that cgGL.h has the types it expected to get by
+// including GL/gl.h (which we disabled above)
+typedef unsigned int    GLenum;
+typedef unsigned char   GLboolean;
+typedef unsigned int    GLbitfield;
+typedef void            GLvoid;
+typedef signed char     GLbyte;         /* 1-byte signed */
+typedef short           GLshort;        /* 2-byte signed */
+typedef int             GLint;          /* 4-byte signed */
+typedef unsigned char   GLubyte;        /* 1-byte unsigned */
+typedef unsigned short  GLushort;       /* 2-byte unsigned */
+typedef unsigned int    GLuint;         /* 4-byte unsigned */
+typedef int             GLsizei;        /* 4-byte signed */
+typedef float           GLfloat;        /* single precision float */
+typedef float           GLclampf;       /* single precision float in [0,1] */
+typedef double          GLdouble;       /* double precision float */
+typedef double          GLclampd;       /* double precision float in [0,1] */
+
+#define CGDLL_API 
+#include <CG/cgGL.h>
+
+
diff --git a/make/stub_includes/common/gl-impl.c b/make/stub_includes/common/gl-impl.c
new file mode 100644
index 000000000..53221a21a
--- /dev/null
+++ b/make/stub_includes/common/gl-impl.c
@@ -0,0 +1,23 @@
+#define GLAPI
+
+// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
+// "glext.h" are parsed.
+#define GL_GLEXT_PROTOTYPES
+
+#include <GL/gl.h>
+
+// Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in
+// "glxext.h" are parsed.
+#define GLX_GLXEXT_PROTOTYPES
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <GL/glxext.h>
+
+// Bring in the wgl extensions
+#define WGL_WGLEXT_PROTOTYPES
+#define SKIP_WGL_HANDLE_DEFINITIONS
+#include <windows.h>
+#include <GL/wglext.h>
+
+// Bring in the Mac OS X cgl extensions
+#include <GL/cglext.h>
diff --git a/make/stub_includes/common/gl.c b/make/stub_includes/common/gl.c
new file mode 100644
index 000000000..e91ee95f3
--- /dev/null
+++ b/make/stub_includes/common/gl.c
@@ -0,0 +1,7 @@
+#define GLAPI
+
+// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
+// "glext.h" are parsed.
+#define GL_GLEXT_PROTOTYPES
+
+#include <GL/gl.h>
diff --git a/make/stub_includes/common/glu-impl.c b/make/stub_includes/common/glu-impl.c
new file mode 100644
index 000000000..2328639d8
--- /dev/null
+++ b/make/stub_includes/common/glu-impl.c
@@ -0,0 +1,3 @@
+#include <GL/glu.h>
+
+
diff --git a/make/stub_includes/common/glu.c b/make/stub_includes/common/glu.c
new file mode 100644
index 000000000..91020e365
--- /dev/null
+++ b/make/stub_includes/common/glu.c
@@ -0,0 +1,2 @@
+#include <GL/glu.h>
+