Changeset 64295 in vbox

Timestamp:

Oct 17, 2016 12:36:43 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

111325

Message:

bugref:3810: X11 Guest Additions maintenance: check VBOX_USE_SYSTEM_GL_HEADERS when building the OpenGL libraries.

File:

• trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk (modified) (2 diffs)

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

@@ -68 +68 @@
 VBoxOGL_INCS           = .
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
- ifdef VBOX_USE_SYSTEM_GL_HEADERS
-  VBoxOGL_INCS += x11
- else
+ ifndef VBOX_USE_SYSTEM_GL_HEADERS
   VBoxOGL_INCS     += \
         $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
@@ -717 +715 @@
 VBoxEGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
 VBoxEGL_SOURCES        = egl.c
-VBoxEGL_INCS           = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
+ifndef VBOX_USE_SYSTEM_GL_HEADERS
+ VBoxEGL_INCS           = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
+endif
 VBoxEGL_LIBS           = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
 VBoxEGL_SONAME.linux   = libEGL.so.1