Changeset 6577 in vbox

Timestamp:

Jan 29, 2008 8:20:46 PM (17 years ago)

Author:

vboxsync

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

27631

Message:

Try use VBOXGUESTR3LIB for VBoxGuestR3LibXFree86. Start building VBoxGuestR3Lib on linux even if it's not yet used anywhere.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -2698 +2698 @@
 #
 TEMPLATE_VBOXGUESTR3EXE         = VBox Guest Program
-ifeq ($(BUILD_TARGET),win)
+ifeq ($(BUILD_TARGET),win) # quick hack
 TEMPLATE_VBOXGUESTR3EXE_EXTENDS = VBOXW32GUESTR3
 else
 TEMPLATE_VBOXGUESTR3EXE_EXTENDS = VBOXR3EXE
-TEMPLATE_VBOXGUESTR3EXE_TOOL   := $(subst XX,CC,$(TEMPLATE_VBOXR3EXE_TOOL))
+#TEMPLATE_VBOXGUESTR3EXE_TOOL   := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
+TEMPLATE_VBOXGUESTR3EXE_TOOL   := $(subst GXX,GCC,$(VBOX_GCC32_TOOL))
 endif
 TEMPLATE_VBOXGUESTR3EXE_INST    = $(INST_ADDITIONS)
+TEMPLATE_VBOXGUESTR3EXE_ASFLAGS = $(VBOX_ASFLAGS32)
 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_ARCH  = x86
 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_CPU   = blend
-TEMPLATE_VBOXGUESTR3EXE_DEFS   := $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) IN_GUEST IN_GUEST_R3 HC_ARCH_BITS=32 GC_ARCH_BITS=32
-if1of ($(BUILD_TARGET),linux)
- TEMPLATE_VBOXGUESTR3EXE_DEFS += IN_RT_R3
- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(TEMPLATE_VBOXR3EXE_LDFLAGS) -static
-endif
+TEMPLATE_VBOXGUESTR3EXE_DEFS   := IN_GUEST IN_GUEST_R3 IN_RT_R3 \
+                                  $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) HC_ARCH_BITS=32 GC_ARCH_BITS=32
 
 #

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

@@ -48 +48 @@
   endif
    LIBRARIES += \
-        VBoxGuestR3LibLinux \
-        VBoxGuestR3LibXFree86
+        VBoxGuestR3Lib \
+        VBoxGuestR3LibXFree86 \
+        VBoxGuestR3LibLinux
  endif
  ifdef VBOX_WITH_OS2_ADDITIONS
@@ -114 +115 @@
 # C library is not available.
 #
-ifeq ($(BUILD_TARGET),linux)
-VBoxGuestR3LibXFree86_TEMPLATE = VBOXLNX32GUESTR3LIB
-VBoxGuestR3LibXFree86_INST     = $(INST_ADDITIONS_LIB)
-else
-VBoxGuestR3LibXFree86_TEMPLATE = FIXME
-endif
+#ifeq ($(BUILD_TARGET),linux) - VBOXGUESTR3LIB should work now (only difference is the default visibility).
+#VBoxGuestR3LibXFree86_TEMPLATE = VBOXLNX32GUESTR3LIB
+#VBoxGuestR3LibXFree86_INST     = $(INST_ADDITIONS_LIB)
+#else
+VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3LIB
+#endif
 VBoxGuestR3LibXFree86_DEFS     = VBOX_HGCM VBOX_VBGLR3_XFREE86
 VBoxGuestR3LibXFree86_SOURCES  = \