Changeset 6555 in vbox

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.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (4 diffs)
• src/VBox/Additions/x11/xgraphics/Makefile.kmk (modified) (6 diffs)

trunk/Config.kmk

@@ -2757 +2757 @@
 #
 VBOX_LIB_IPRT_GUEST_R3          = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB)
-VBOX_LIB_IPRT_GUEST_MINI_R3     = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB)
+VBOX_LIB_IPRT_GUEST_R3_MINI     = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB)
 VBOX_LIB_IPRT_GUEST_R0          = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_LIB)
 VBOX_LIB_VBGL_R3                = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB)
+VBOX_LIB_VBGL_R3_XFREE86        = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_LIB)
 VBOX_LIB_VBGL_R0BASE            = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0LibBase$(VBOX_SUFF_LIB)
 VBOX_LIB_VBGL_R0                = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0Lib$(VBOX_SUFF_LIB)

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
 #

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

@@ -26 +26 @@
 SUFF_DLL = .so
 
-# For now
+## @todo clean up this by switching to VBoxGuestR3Lib
 VBOX_LIB_VBGL_R3 := $(PATH_LIB)/VBoxGuestR3LibLinux.a
-VBOX_LIB_VBGL_R3_XFREE86 := $(PATH_LIB)/VBoxGuestR3LibLinuxXFree86.a
 
 vboxvideo_drv_TEMPLATE = VBOXLNX32GUESTR3EXE
@@ -126 +125 @@
 vboxvideo_drv_70_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_MINI_R3) \
+        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
         $(VBOX_LIB_VBGL_R3)
 
@@ -142 +141 @@
 vboxvideo_drv_71_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_MINI_R3) \
+        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
         $(VBOX_LIB_VBGL_R3)
 
@@ -158 +157 @@
 vboxvideo_drv_13_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_MINI_R3) \
+        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
         $(VBOX_LIB_VBGL_R3)
 
@@ -176 +175 @@
 vboxvideo_drv_14_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_MINI_R3) \
+        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
         $(VBOX_LIB_VBGL_R3)
 endif
@@ -198 +197 @@
         $(VBOX_LIB_IPRT_GUEST_R3) \
         $(VBOX_LIB_VBGL_R3)
-## @todo Use VBOX_LIB_IPRT_GUEST_MINI_R3 instead of VBOX_LIB_IPRT_GUEST_R3?
+## @todo Use VBOX_LIB_IPRT_GUEST_R3_MINI instead of VBOX_LIB_IPRT_GUEST_R3?
 endif