Changeset 59112 in vbox

Timestamp:

Dec 14, 2015 10:49:19 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: add initial libEGL.so.1 to the X11 Additions.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/common/crOpenGL/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/common/crOpenGL/egl.c (added)

trunk/Config.kmk

@@ -2268 +2268 @@
 
  ifeq ($(KBUILD_TARGET),win)
+  VBOX_LIB_OGL = $(PATH_OBJ)/VBoxOGLcrutil/VBoxOGL$(VBOX_SUFF_LIB)
   VBOX_LIB_OGL_CRUTIL = $(PATH_OBJ)/VBoxOGLcrutil/VBoxOGLcrutil$(VBOX_SUFF_LIB)
   VBOX_LIB_OGL_HOSTCRUTIL = $(PATH_OBJ)/VBoxOGLhostcrutil/VBoxOGLhostcrutil$(VBOX_SUFF_LIB)
   ifeq ($(KBUILD_TARGET),x86)
+   VBOX_LIB_OGL_X86             = $(VBOX_LIB_OGL)
    VBOX_LIB_OGL_CRUTIL_X86      = $(VBOX_LIB_OGL_CRUTIL)
   else
+   VBOX_LIB_OGL_X86             = $(PATH_OBJ)/VBoxOGLcrutil-x86/VBoxOGL-x86$(VBOX_SUFF_LIB)
    VBOX_LIB_OGL_CRUTIL_X86      = $(PATH_OBJ)/VBoxOGLcrutil-x86/VBoxOGLcrutil-x86$(VBOX_SUFF_LIB)
   endif
  else
+  VBOX_LIB_OGL        = $(VBOX_PATH_ADDITIONS)/VBoxOGL$(VBOX_SUFF_DLL)
   VBOX_LIB_OGL_CRUTIL = $(VBOX_PATH_ADDITIONS)/VBoxOGLcrutil$(VBOX_SUFF_DLL)
   VBOX_LIB_OGL_HOSTCRUTIL = $(PATH_STAGE_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -31 +31 @@
     VBoxOGLpassthroughspu \
     VBoxOGLpackspu \
-    VBoxOGLfeedbackspu
+    VBoxOGLfeedbackspu \
+    VBoxEGL
 endif
 
@@ -707 +708 @@
         $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
 
+VBoxEGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
+VBoxEGL_SOURCES        = egl.c
+VBoxEGL_INCS           = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
+VBoxEGL_LIBS           = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
+VBoxEGL_SONAME.linux   = libEGL.so.1
+
 include $(FILE_KBUILD_SUB_FOOTER)