diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 10 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 2 | ||||
| -rw-r--r-- | make/build-newt.xml | 4 | ||||
| -rwxr-xr-x | make/config/jogl/eglext.cfg | 3 | ||||
| -rwxr-xr-x | make/stub_includes/egl/EGL/egl.h | 5 |
5 files changed, 18 insertions, 6 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index c48745da7..290ed67ca 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1204,6 +1204,10 @@ <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" /> </linker> + <linker id="linker.cfg.linux.jogl.egl" extends="linker.cfg.linux"> + <syslibset dir="/nfsroot/lg/lib" libs="EglUtil"/> + </linker> + <linker id="linker.cfg.linux.jogl.gl2" extends="linker.cfg.linux.jogl.x11"> <syslibset dir="/usr/X11R6/lib" libs="GL"/> </linker> @@ -1331,7 +1335,11 @@ <property name="linker.cfg.id.cg" value="linker.cfg.linux.jogl.cg" /> </target> - <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" /> + <target name="c.configure.linux" + depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" + if="isLinux"> + <property name="linker.cfg.id.egl" value="linker.cfg.linux.jogl.egl" /> + </target> <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit"> <echo message="Solaris" /> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 79e6b93ae..e19d75ba2 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -490,8 +490,6 @@ <!-- linker configuration --> <linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux"> - <syslibset dir="/usr/X11R6/lib" libs="X11"/> - <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.linux.amd64.nativewindow.x11" extends="linker.cfg.linux.amd64"> diff --git a/make/build-newt.xml b/make/build-newt.xml index 4895318e0..ee4b6ee17 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -137,7 +137,7 @@ value="com/sun/javafx/newt/macosx/*"/> <property name="java.part.opengl" - value="com/sun/javafx/newt/opengl/*, com/sun/javafx/newt/opengl/kd/*"/> + value="com/sun/javafx/newt/opengl/*, com/sun/javafx/newt/opengl/egl/*, com/sun/javafx/newt/opengl/kd/*"/> <property name="java.part.awt" value="com/sun/javafx/newt/awt/*"/> @@ -367,8 +367,6 @@ <!-- linker configuration --> <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux"> - <syslibset dir="/usr/X11R6/lib" libs="X11"/> - <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64"> diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg index bdd9a3655..0447dd1e4 100755 --- a/make/config/jogl/eglext.cfg +++ b/make/config/jogl/eglext.cfg @@ -124,3 +124,6 @@ Ignore eglTerminate Ignore eglWaitClient Ignore eglWaitGL Ignore eglWaitNative + +Ignore EGLUtil_CreateDisplayByNative +Ignore EGLUtil_CreateWindowByNative diff --git a/make/stub_includes/egl/EGL/egl.h b/make/stub_includes/egl/EGL/egl.h index 86ca4818f..5b4c4215c 100755 --- a/make/stub_includes/egl/EGL/egl.h +++ b/make/stub_includes/egl/EGL/egl.h @@ -297,6 +297,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface) EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target); +EGLAPI EGLDisplay EGLAPIENTRY EGLUtil_CreateDisplayByNative(EGLint w, EGLint h); + +EGLAPI EGLSurface EGLAPIENTRY EGLUtil_CreateWindowByNative(EGLDisplay dpy, EGLint xx, + EGLint *wvalue, EGLint *hvalue); + typedef void (* EGLAPIENTRY __EGLFuncPtr)(void); EGLAPI __EGLFuncPtr eglGetProcAddress(const char *procname); |