diff options
| -rw-r--r-- | make/build-jogl.xml | 2 | ||||
| -rw-r--r-- | make/config/jogl/gl-gl2es12.cfg | 4 | ||||
| -rwxr-xr-x | make/config/jogl/gl-headers.cfg | 4 | ||||
| -rwxr-xr-x | make/config/jogl/gl3-headers.cfg | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 08f0d6ef2..e5bb1ab38 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1776,7 +1776,7 @@ <include name="com/sun/javafx/**" /> </fileset> <fileset dir="${src.java}" - includes="${java.part.util.fixedfunc.shaders}"/> + includes="${java.part.util.fixedfuncemu.shadercode}"/> </jar> </target> <target name="build-jars-all-cdc" depends="setup-manifestfile"> diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg index c233ef4fd..27fa138d4 100644 --- a/make/config/jogl/gl-gl2es12.cfg +++ b/make/config/jogl/gl-gl2es12.cfg @@ -32,6 +32,10 @@ ForceProcAddressGen glMapBuffer # depend on the presence of an import library for a particular device ForceProcAddressGen __ALL__ +# Also force the calling conventions of the locally generated function +# pointer typedefs for these routines to APIENTRY +LocalProcAddressCallingConvention __ALL__ APIENTRY + EmitProcAddressTable true ProcAddressTableClassName GL2ES12ProcAddressTable GetProcAddressTableExpr ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable()) diff --git a/make/config/jogl/gl-headers.cfg b/make/config/jogl/gl-headers.cfg index 1cc5bf05b..5a648b582 100755 --- a/make/config/jogl/gl-headers.cfg +++ b/make/config/jogl/gl-headers.cfg @@ -35,7 +35,3 @@ CustomCCode #include <GL/gl.h> CustomCCode #include <GL/glx.h> CustomCCode #include <GL/glxext.h> CustomCCode #endif -CustomCCode /* Provide GLES #define for locally generated function pointer typedefs */ -CustomCCode #ifndef GL_APIENTRY -CustomCCode #define GL_APIENTRY GLAPIENTRY -CustomCCode #endif diff --git a/make/config/jogl/gl3-headers.cfg b/make/config/jogl/gl3-headers.cfg index 282a91ec5..8af9157cf 100755 --- a/make/config/jogl/gl3-headers.cfg +++ b/make/config/jogl/gl3-headers.cfg @@ -23,7 +23,3 @@ CustomCCode #include <stdlib.h> CustomCCode #include <X11/Xlib.h> CustomCCode #include <GL3/gl3.h> CustomCCode #endif -CustomCCode /* Provide GLES #define for locally generated function pointer typedefs */ -CustomCCode #ifndef GL_APIENTRY -CustomCCode #define GL_APIENTRY GLAPIENTRY -CustomCCode #endif |