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

Timestamp:

Jan 30, 2008 2:00:22 PM (17 years ago)

Author:

vboxsync

Message:

Fixed the PIC issue with the X11 drivers: Made VBOX_LIB_IPRT_GUEST_R3_MINI shared. Created a shared version of VBoxGuestR3Lib (VBOX_LIB_VBGL_R3_SHARED). And switched the drivers to use this.

File:

• trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk (modified) (6 diffs)

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

@@ -25 +25 @@
 # for BUILD_TARGET=l4
 SUFF_DLL = .so
-
-## @todo clean up this by switching to VBoxGuestR3Lib
-VBOX_LIB_VBGL_R3 := $(PATH_LIB)/VBoxGuestR3LibLinux.a
 
 vboxvideo_drv_TEMPLATE = VBOXLNX32GUESTR3EXE
@@ -124 +121 @@
         vboxutils-new.c
 vboxvideo_drv_70_LIBS = \
-        $(VBOX_LIB_VBGL_R3) \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
         $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3)
+        $(VBOX_LIB_VBGL_R3_SHARED)
 
 vboxvideo_drv_71_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
 vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
 vboxvideo_drv_71_CFLAGS.linux := $(vboxvideo_drv_70_CFLAGS.linux)
-vboxvideo_drv_71_LDFLAGS = -s 
+vboxvideo_drv_71_LDFLAGS = -s
 vboxvideo_drv_71_INCS = \
         ../x11include/7.1 \
@@ -140 +137 @@
         vboxutils-new.c
 vboxvideo_drv_71_LIBS = \
-        $(VBOX_LIB_VBGL_R3) \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
         $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3)
+        $(VBOX_LIB_VBGL_R3_SHARED)
 
 vboxvideo_drv_13_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
 vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS)
 vboxvideo_drv_13_CFLAGS.linux := $(vboxvideo_drv_70_CFLAGS.linux)
-vboxvideo_drv_13_LDFLAGS = -s 
+vboxvideo_drv_13_LDFLAGS = -s
 vboxvideo_drv_13_INCS = \
         ../x11include/1.3 \
@@ -156 +153 @@
         vboxutils-new.c
 vboxvideo_drv_13_LIBS = \
-        $(VBOX_LIB_VBGL_R3) \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
         $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3)
+        $(VBOX_LIB_VBGL_R3_SHARED)
 
 vboxvideo_drv_14_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
 vboxvideo_drv_14_DEFS := $(vboxvideo_drv_70_DEFS)
 vboxvideo_drv_14_CFLAGS.linux := $(vboxvideo_drv_70_CFLAGS.linux)
-vboxvideo_drv_14_LDFLAGS = -s 
+vboxvideo_drv_14_LDFLAGS = -s
 vboxvideo_drv_14_INCS = \
         ../x11include/1.4 \
@@ -174 +171 @@
         vboxutils-new.c
 vboxvideo_drv_14_LIBS = \
-        $(VBOX_LIB_VBGL_R3) \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
         $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3)
+        $(VBOX_LIB_VBGL_R3_SHARED)
 endif
 
@@ -194 +191 @@
         vboxutils-new.c
 vboxvideo_drv_LIBS = \
-        $(VBOX_LIB_VBGL_R3) \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
         $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3)
+        $(VBOX_LIB_VBGL_R3_SHARED)
 endif