Changeset 6604 in vbox for trunk

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.

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -2729 +2729 @@
 TEMPLATE_VBOXGUESTR3DLL          = VBox Guest User Dynamic Libraries
 TEMPLATE_VBOXGUESTR3DLL_EXTENDS  = VBOXGUESTR3EXE
+## @todo add a INSTFUN that separates dlls and libs.
 ifn1of ($(BUILD_TARGET), os2 win)
  TEMPLATE_VBOXGUESTR3DLL_DEFS       = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC
@@ -2779 +2780 @@
 
 #
-# Guest additions libraries.
+# Guest additions libraries (all static).
+#   The _MINI and _SHARED are both compiled as PIC and intended for linking into a .so/.dll/.dylib.
 #
 VBOX_LIB_IPRT_GUEST_R3          = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB)
@@ -2786 +2788 @@
 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_R3_SHARED         = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(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

@@ -26 +26 @@
  ifneq ($(BUILD_TARGET),win)
   LIBRARIES += \
-        VBoxGuestR3Lib
+        VBoxGuestR3Lib \
+        VBoxGuestR3LibShared
  endif
 else
@@ -49 +50 @@
    LIBRARIES += \
         VBoxGuestR3Lib \
+        VBoxGuestR3LibShared \
         VBoxGuestR3LibXFree86 \
         VBoxGuestR3LibLinux
@@ -108 +110 @@
         VBoxGuestR3LibTime.cpp \
         VBoxGuestR3LibVideo.cpp
+
+#
+# VBoxGuestR3LibShared - a PIC variant of VBoxGuestR3Lib for linking into .so/.dll/.dylib.
+#
+VBoxGuestR3LibShared_TEMPLATE = VBOXGUESTR3DLL
+VBoxGuestR3LibShared_DEFS    := $(VBoxGuestR3Lib_DEFS)
+VBoxGuestR3LibShared_SOURCES := $(VBoxGuestR3Lib_SOURCES)
+VBoxGuestR3LibShared_INST    := $(INST_ADDITIONS_LIB)
 
 

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
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -527 +527 @@
 #                      for X11 drivers.
 #
-ifeq ($(BUILD_TARGET),linux) ## @todo elimiate this by fixing VBOXGUESTR3LIB/DLL/EXE. What about NOCPP like the x11 bits?
-RuntimeGuestR3Mini_TEMPLATE             := VBOXLNX32GUESTR3LIB
-RuntimeGuestR3Mini_INST                  = $(INST_ADDITIONS_LIB)
-RuntimeGuestR3Mini_CXXFLAGS.linux        = -fno-exceptions
-else
 RuntimeGuestR3Mini_TEMPLATE             := VBOXGUESTR3DLL
-endif
+RuntimeGuestR3Mini_INST                 := $(INST_ADDITIONS_LIB)
 RuntimeGuestR3Mini_SDKS.win             := $(RuntimeR3_SDKS.win)
 RuntimeGuestR3Mini_DEFS                 := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS)) \