Changeset 6667 in vbox

Timestamp:

Jan 31, 2008 4:32:20 PM (17 years ago)

Author:

vboxsync

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

27738

Message:

Added VBOXGUESTR3XORGMOD and VBOXGUESTR3XF86MOD for the X11 drivers. Made VBOXGUESTR* cross build linux when BUILD_TARGET is l4 (untested).

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -2657 +2657 @@
 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
+ifeq ($(BUILD_TARGET),l4) # cross building linux on l4.
+ TEMPLATE_VBOXGUESTR3EXE_BLD_TRG  = linux
+ TEMPLATE_VBOXGUESTR3EXE_DLLSUFF  = .so
+ TEMPLATE_VBOXGUESTR3EXE_SYSSUFF  = .ko
+endif
 
 #
@@ -2685 +2690 @@
 
 #
+# Template for XFree86 guest modules (relocatable module, i.e. sysmod).
+# This mostly about zapping the VBOXR3EXE linker flags and libraries.
+#
+TEMPLATE_VBOXGUESTR3XF86MOD         = VBox Guest Program with C++ library dependencies
+TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBOXGUESTR3EXE
+TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(BUILD_TYPE)      = $(NO_SUCH_VARIABLE)
+TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(BUILD_TARGET)    = $(NO_SUCH_VARIABLE)
+TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.linux              = $(NO_SUCH_VARIABLE)
+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS                 = $(NO_SUCH_VARIABLE)
+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(BUILD_TARGET) = $(NO_SUCH_VARIABLE)
+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(BUILD_TYPE)   = $(NO_SUCH_VARIABLE)
+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux           = $(NO_SUCH_VARIABLE)
+if1of ($(BUILD_TARGET), freebsd linux l4 netbsd openbsd) # the gnu ld guys.
+ TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release = -S
+endif
+TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS   = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99
+TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants
+TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF  = .o
+TEMPLATE_VBOXGUESTR3XF86MOD_LIBS     = \
+        $(VBOX_LIB_VBGL_R3_XFREE86)
+
+
+#
+# Template for X.org guest modules (shared libs).
+# This mostly about zapping unnecessary LIBS from VBOXGUESTR3DLL and adding some flags.
+#
+TEMPLATE_VBOXGUESTR3XORGMOD         = VBox Guest Program with C++ library dependencies
+TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL
+TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(BUILD_TYPE)      = $(NO_SUCH_VARIABLE)
+TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(BUILD_TARGET)    = $(NO_SUCH_VARIABLE)
+TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.linux              = $(NO_SUCH_VARIABLE)
+if1of ($(BUILD_TARGET), linux l4) # Is this -s really needed? And what about -std=c99? Solaris doesn't seem to require it.
+ TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS) -std=c99
+ TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS) -s
+endif
+TEMPLATE_VBOXGUESTR3XORGMOD_LIBS = \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
+        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
+        $(VBOX_LIB_VBGL_R3_SHARED)
+
+
+#
 # Template for guest stuff that makes use of the C++ library and features.
 # (This is mostly about undoing what was done to C++ for VBOXGUESTR3EXE.)
@@ -2710 +2757 @@
 TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = W2K3DDK WINPSDKINCS
 TEMPLATE_VBOXGUESTR0_DEFS       = $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR0DRV_DEFS)) IN_GUEST IN_GUEST_R0 HC_ARCH_BITS=32 GC_ARCH_BITS=32
+ifeq ($(BUILD_TARGET),l4) # cross building linux on l4.
+ TEMPLATE_VBOXGUESTR0_BLD_TRG   = linux
+ TEMPLATE_VBOXGUESTR0_SYSSUFF   = .ko
+endif
 
 #