diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 5 | ||||
| -rwxr-xr-x | make/gl-es1.cfg | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index 608e02e30..c758b69c4 100644 --- a/make/build.xml +++ b/make/build.xml @@ -892,6 +892,8 @@ <include name="${rootrel.src.c.jogl}/Mixer.cpp" if="isWindows"/> <!-- FIXME: the WindowsWindow should be moved to another library --> <include name="${rootrel.src.c.jogl}/WindowsWindow.c" if="isWindows"/> + <!-- FIXME: the X11Window should be moved to another library --> + <include name="${rootrel.src.c.jogl}/X11Window.c" if="isX11"/> <include name="${rootrel.generated.c.jogl}/*GL*.c" unless="jogl.noglnatives"/> <include name="${rootrel.src.c.jogl}/XineramaHelper.c" if="isX11"/> <!-- Xinerama supporting functions for Linux only (for now) --> @@ -1013,6 +1015,9 @@ <!-- FIXME: this is temporary until we move this to another workspace --> <javah destdir="../build/gensrc/native/jogl" classpath="${jogl.jar}" class="com.sun.javafx.newt.windows.WindowsWindow" /> + <!-- FIXME: this is temporary until we move this to another workspace --> + <javah destdir="../build/gensrc/native/jogl" classpath="${jogl.jar}" class="com.sun.javafx.newt.x11.X11Window" /> + <!-- Compile stuff --> <antcall target="c.build" inheritRefs="true"> <param name="c.compiler.src.files" value="c.src.files.jogl"/> diff --git a/make/gl-es1.cfg b/make/gl-es1.cfg index 629d59330..19f33f3c4 100755 --- a/make/gl-es1.cfg +++ b/make/gl-es1.cfg @@ -179,8 +179,8 @@ CustomCCode #define GL_APICALL __declspec(dllimport) CustomCCode #include <GLES/gl.h> CustomCCode #include <GLES/glext.h> CustomCCode #include <stdlib.h> -CustomCCode /* Include missing function pointer typedef */ -CustomCCode typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); +# CustomCCode /* Include missing function pointer typedef */ +# CustomCCode typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); CustomCCode typedef int intptr_t; |