Changeset 35398 in vbox for trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

Timestamp:

Jan 4, 2011 9:39:07 AM (14 years ago)

Author:

vboxsync

Message:

re-applied r69255, r69257: properly wrap mem* to xf86mem* for older XF86 modules

File:

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

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

@@ -38 +38 @@
         XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
-        IN_MODULE XFree86Module
+        IN_MODULE XFree86Module IN_XF86_MODULE
 vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy
 vboxvideo_drv_INCS = \
@@ -75 +75 @@
         vboxutils.c \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
-        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp \
-        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
-        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
+        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp
 
 
@@ -97 +97 @@
 endif
 vboxvideo_drv_70_DEFS := \
-        XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1
+        XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 IN_XF86_MODULE
 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
  vboxvideo_drv_70_DEFS += __EXTENSIONS__