diff options
| author | Kenneth Russel <[email protected]> | 2004-04-22 04:09:32 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2004-04-22 04:09:32 +0000 |
| commit | b93224554832f838871c247823125ded1cf126bb (patch) | |
| tree | fd55ea12ae63f5a7265e2b885300482f07542953 | |
| parent | 9512c9fa62ece3960472b6ab2cd6ce5244da8501 (diff) | |
Fixed build problems on Linux after addition of OpenGL 1.5 support.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@116 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 9 | ||||
| -rw-r--r-- | make/gl-common-x11.cfg | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | make/stub_includes/common/stddef.h (renamed from make/stub_includes/opengl/stddef.h) | 0 |
3 files changed, 9 insertions, 3 deletions
diff --git a/make/build.xml b/make/build.xml index 0769b520c..1814c1ffd 100644 --- a/make/build.xml +++ b/make/build.xml @@ -161,12 +161,14 @@ <include name="${stub.includes.dir}/macosx/**" /> <include name="${stub.includes.dir}/win32/**" /> <include name="${stub.includes.dir}/x11/**" /> + <include name="${stub.includes.dir}/common/**" /> </dirset> <fileset id="stub.includes.dependencies.fileset" dir="."> <include name="${stub.includes.dir}/opengl/**" /> <include name="${stub.includes.dir}/macosx/**" /> <include name="${stub.includes.dir}/win32/**" /> <include name="${stub.includes.dir}/x11/**" /> + <include name="${stub.includes.dir}/common/**" /> <include name="*.cfg" /> <include name="*.java" /> <include name="*.c" /> @@ -178,6 +180,7 @@ <include name="${stub.includes.dir}/macosx/**" /> <include name="${stub.includes.dir}/win32/**" /> <include name="${stub.includes.dir}/x11/**" /> + <include name="${stub.includes.dir}/common/**" /> </dirset> <fileset id="stub.includes.cg.dependencies.fileset" dir="."> <include name="${stub.includes.dir}/cg/**" /> @@ -248,7 +251,7 @@ <property name="java.includes.dir.platform" value="${java.includes.dir.win32}" /> <property name="java.lib.dir.platform" value="${java.lib.dir.win32}" /> <property name="java.excludes.platform" value="${java.excludes.win32}" /> - <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/win32/**" /> + <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/win32/** ${stub.includes.dir}/common/**" /> <!-- Set Javadoc properties. --> <property name="javadoc.dev.packagenames.platform" value="${javadoc.dev.packagenames.win32}" /> @@ -336,7 +339,7 @@ <!-- Set platform directories. --> <property name="stub.includes.platform" value="${stub.includes.x11}" /> <property name="java.excludes.platform" value="${java.excludes.x11}" /> - <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/opengl/** ${stub.includes.dir}/x11/**" /> + <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/opengl/** ${stub.includes.dir}/x11/** ${stub.includes.dir}/common/**" /> <!-- Set Javadoc properties. --> <property name="javadoc.dev.packagenames.platform" value="${javadoc.dev.packagenames.x11}" /> @@ -401,7 +404,7 @@ <property name="java.includes.dir.platform" value="${java.includes.dir.macosx}" /> <property name="java.lib.dir.platform" value="${java.lib.dir.macosx}" /> <property name="java.excludes.platform" value="${java.excludes.macosx}" /> - <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/macosx/**" /> + <property name="stub.includes.fileset.platform.params" value="${stub.includes.dir}/macosx/** ${stub.includes.dir}/common/**" /> <!-- Set Javadoc properties. --> <property name="javadoc.dev.packagenames.platform" value="${javadoc.dev.packagenames.macosx}" /> diff --git a/make/gl-common-x11.cfg b/make/gl-common-x11.cfg index 39dc0ba0e..15154e363 100644 --- a/make/gl-common-x11.cfg +++ b/make/gl-common-x11.cfg @@ -13,6 +13,9 @@ ReturnedArrayLength XGetVisualInfo {3}[0] ReturnValueCapacity glXChooseVisual sizeof(XVisualInfo) ReturnValueCapacity glXGetVisualFromFBConfig sizeof(XVisualInfo) ReturnValueCapacity glXGetVisualFromFBConfigSGIX sizeof(XVisualInfo) +# Elide the version of XGetVisualInfo taking a direct buffer for the third argument +# (since we can't specify different glue code for different overloadings -- FIXME) +NoNio XGetVisualInfo Unimplemented cgl.+ Unimplemented wgl.+ diff --git a/make/stub_includes/opengl/stddef.h b/make/stub_includes/common/stddef.h index 8aa70051e..8aa70051e 100755..100644 --- a/make/stub_includes/opengl/stddef.h +++ b/make/stub_includes/common/stddef.h |