Changeset 23347 in vbox

Timestamp:

Sep 25, 2009 6:42:36 PM (15 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: only build DRI bits if VBOX_OPENGL is defined (c.f. patch by Bernhard Froehlich on vbox-dev)

File:

• trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -198 +198 @@
 vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS \
-                         VBOX_NO_LOW_COLOUR VBOX_DRI
+                         VBOX_NO_LOW_COLOUR $(if $(VBOX_OPENGL) VBOX_DRI,)
 vboxvideo_drv_15_INCS = \
         $(VBOX_PATH_X11_XORG_1_5) \
@@ -209 +209 @@
         vboxvideo_13.c \
         vboxutils.c \
-        vboxvideo_dri.c
+        $(if $(VBOX_OPENGL) vboxvideo_dri.c,)
 
 
@@ -227 +227 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-vboxvideo_drv_16_SOURCES  = \
-        vboxvideo_13.c \
-        vboxutils.c \
-        vboxvideo_dri.c
+vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
 
 
@@ -255 +252 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.15
-vboxvideo_drv_17_SOURCES  = \
-        vboxvideo_13.c \
-        vboxutils.c \
-        vboxvideo_dri.c
+vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)