Changeset 6555 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jan 29, 2008 2:38:47 AM (17 years ago)

Author:

vboxsync

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

27586

Message:

.._GUEST_MINI_R3 -> GUEST_R3_MINI. Added VBOX_LIB_VBGL_R3_XFREE86 to Config.kmk. VBoxGuestR3LibXFree86 instead of VBoxGuestR3LibLinuxXFree86.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (4 diffs)

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

@@ -49 +49 @@
    LIBRARIES += \
         VBoxGuestR3LibLinux \
-        VBoxGuestR3LibLinuxXFree86
+        VBoxGuestR3LibXFree86
  endif
  ifdef VBOX_WITH_OS2_ADDITIONS
@@ -108 +108 @@
         VBoxGuestR3LibVideo.cpp
 
+
 #
 # VBoxGuestR3LibXFree86 - a reduced version of the guest library which uses
-# the X server runtime instead of iprt, for use with old servers where the
+# the X server runtime instead of IPRT, for use with old servers where the
 # C library is not available.
 #
-VBoxGuestR3LibXFree86_SOURCES    = \
+ifeq ($(BUILD_TARGET),linux))
+VBoxGuestR3LibXFree86_TEMPLATE = VBOXLNX32GUESTR3LIB
+VBoxGuestR3LibXFree86_INST     = $(INST_ADDITIONS_LIB)
+else
+VBoxGuestR3LibXFree86_TEMPLATE = FIXME
+endif
+VBoxGuestR3LibXFree86_DEFS     = VBOX_HGCM VBOX_VBGLR3_XFREE86
+VBoxGuestR3LibXFree86_SOURCES  = \
         VBoxGuestR3Lib.cpp \
         VBoxGuestR3LibGR.cpp \
@@ -119 +127 @@
         VBoxGuestR3LibMisc.cpp \
         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
 
 
@@ -174 +187 @@
 
 #
-# VBoxGuestR3LibLinuxXFree86
-#
-VBoxGuestR3LibLinuxXFree86_TEMPLATE = VBOXLNX32GUESTR3LIB
-VBoxGuestR3LibLinuxXFree86_SOURCES  = $(VBoxGuestR3LibXFree86_SOURCES)
-VBoxGuestR3LibLinuxXFree86_DEFS     = VBOX_HGCM VBOX_VBGLR3_XFREE86
-VBoxGuestR3LibLinuxXFree86_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
-
-
-#
 # VBoxGuestR0LibOS2
 #