Changeset 64271 in vbox for trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

Timestamp:

Oct 14, 2016 7:37:12 AM (8 years ago)

Author:

vboxsync

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) (3 diffs)

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

@@ -68 +68 @@
 VBoxOGL_INCS           = .
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_INCS     += \
+ ifdef VBOX_USE_SYSTEM_GL_HEADERS
+  VBoxOGL_INCS += x11
+ else
+  VBoxOGL_INCS     += \
         $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
         $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
@@ -79 +82 @@
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-        $(VBOX_GL_INCS) \
-        $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+        $(VBOX_GL_INCS)
+ endif
  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
 endif
@@ -214 +217 @@
 
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_LIBS += \
+ ifdef VBOX_USE_SYSTEM_GL_HEADERS
+  VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext
+ else
+  VBoxOGL_LIBS += \
         $(PATH_STAGE_LIB)/libXcomposite.so \
         $(PATH_STAGE_LIB)/libXdamage.so \
         $(PATH_STAGE_LIB)/libXfixes.so \
         $(PATH_STAGE_LIB)/libXext.so
+ endif
  ifdef VBoxOGL_FAKEDRI
   ifeq ($(KBUILD_TARGET), freebsd)