Changeset 6578 in vbox for trunk

Timestamp:

Jan 29, 2008 8:26:16 PM (17 years ago)

Author:

vboxsync

Message:

Added VBOX_PATH_X11_* variables that points to the various versions of the X11 headers.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -976 +976 @@
 VBOX_PATH_MACOSX_SDK ?= /Developer/SDKs/MacOSX10.4u.sdk
 VBOX_PATH_MACOSX_SDK_INCS ?= $(VBOX_PATH_MACOSX_SDK)/Developer/Headers
+
+#
+# The X11 headers.
+#
+VBOX_PATH_X11_ROOT      = $(PATH_ROOT)/src/VBox/Additions/x11/x11include
+VBOX_PATH_X11_XFREE_4_2 = $(VBOX_PATH_X11_ROOT)/4.2
+VBOX_PATH_X11_XFREE_4_3 = $(VBOX_PATH_X11_ROOT)/4.3
+VBOX_PATH_X11_XORG_7_0  = $(VBOX_PATH_X11_ROOT)/7.0
+VBOX_PATH_X11_XORG_7_1  = $(VBOX_PATH_X11_ROOT)/7.1
+VBOX_PATH_X11_XORG_1_3  = $(VBOX_PATH_X11_ROOT)/1.3
+VBOX_PATH_X11_XORG_1_4  = $(VBOX_PATH_X11_ROOT)/1.4
 
 

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

@@ -129 +129 @@
         VBoxGuestR3LibVideo.cpp
 VBoxGuestR3LibXFree86_INCS     = \
-        ../../x11/x11include/4.2/programs/Xserver/hw/xfree86/common/ \
-        ../../x11/x11include/4.2/programs/Xserver/hw/xfree86/os-support \
-        ../../x11/x11include/4.2/programs/Xserver/include \
-        ../../x11/x11include/4.2/exports/include/X11
+        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/common/ \
+        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/os-support \
+        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/include \
+        $(VBOX_PATH_X11_XFREE_4_2)/exports/include/X11