Changeset 6539 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Jan 28, 2008 7:51:33 PM (17 years ago)

Author:

vboxsync

Message:

Additions/X11: made the X server graphics driver use the R3 guest library in Linux guests

Location:

trunk/src/VBox/Additions/x11/xgraphics

Files:

• Makefile.kmk (modified) (7 diffs)
• vboxutils-new.c (modified) (1 diff)
• vboxutils.c (modified) (1 diff)

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

@@ -28 +28 @@
 # For now
 VBOX_LIB_VBGL_R3 := $(PATH_LIB)/VBoxGuestR3LibLinux.a
-VBOX_LIB_IPRT_GUEST_R3 := $(PATH_LIB)/RuntimeLnx32GuestR3.a
+VBOX_LIB_VBGL_R3_XFREE86 := $(PATH_LIB)/VBoxGuestR3LibLinuxXFree86.a
+VBOX_LIB_IPRT_GUEST_R3 := $(PATH_LIB)/RuntimeLnx32GuestR3Shared.a
 
 vboxvideo_drv_TEMPLATE = VBOXLNX32GUESTR3EXE
@@ -105 +106 @@
 vboxvideo_drv_SOURCES = \
         vboxvideo_68.c \
-        vboxutils.c
+        vboxutils-new.c
 vboxvideo_drv_LIBS = \
-        $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_R3)
+        $(VBOX_LIB_VBGL_R3_XFREE86)
 
 vboxvideo_drv_70_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
@@ -124 +124 @@
 vboxvideo_drv_70_SOURCES  = \
         vboxvideo_70.c \
-        vboxutils.c
+        vboxutils-new.c
 vboxvideo_drv_70_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_R3)
+        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(VBOX_LIB_VBGL_R3)
 
 vboxvideo_drv_71_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
@@ -139 +140 @@
 vboxvideo_drv_71_SOURCES  = \
         vboxvideo_70.c \
-        vboxutils.c
+        vboxutils-new.c
 vboxvideo_drv_71_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_R3)
+        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(VBOX_LIB_VBGL_R3)
 
 vboxvideo_drv_13_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
@@ -154 +156 @@
 vboxvideo_drv_13_SOURCES  = \
         vboxvideo_13.c \
-        vboxutils.c
+        vboxutils-new.c
 vboxvideo_drv_13_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_R3)
+        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(VBOX_LIB_VBGL_R3)
 
 vboxvideo_drv_14_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
@@ -171 +174 @@
 vboxvideo_drv_14_SOURCES  = \
         vboxvideo_13.c \
-        vboxutils.c
+        vboxutils-new.c
 vboxvideo_drv_14_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_R3)
+        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(VBOX_LIB_VBGL_R3)
 endif
 
@@ -193 +197 @@
 vboxvideo_drv_LIBS = \
         $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_R3)
+        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(VBOX_LIB_VBGL_R3)
 endif
 

trunk/src/VBox/Additions/x11/xgraphics/vboxutils-new.c

@@ -847 +847 @@
 }
 
+/* Make our C++ libraries happy. */
+extern int __gxx_personality_v0;
+int __gxx_personality_v0 = 0xdeadbeef;

trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c

@@ -997 +997 @@
     return FALSE;
 }
+
+extern int __gxx_personality_v0;
+int __gxx_personality_v0 = 0xdeadbeef;