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

Timestamp:

May 17, 2013 3:35:09 PM (12 years ago)

Author:

vboxsync

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

85846

Message:

Additions/linux: build 32-bit versions too for COMPATIBLE builds.

Location:

trunk/src/VBox/Additions/x11

Files:

• VBoxClient/Makefile.kmk (modified) (1 diff)
• vboxmouse/Makefile.kmk (modified) (1 diff)
• vboxvideo/Makefile.kmk (modified) (2 diffs)

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

@@ -76 +76 @@
 endif
 
+# 32-bit version for the 64-bit Linux Additions
+ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
+ ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
+  PROGRAMS += VBoxClient_32
+  VBoxClient_32_EXTENDS  = VBoxClient
+  VBoxClient_32_TEMPLATE = NewVBoxGuestR3Exe_X86
+  VBoxClient_32_NAME     = VBoxClient
+ endif
+endif
+
 ifdef VBOX_X11_SEAMLESS_GUEST
  if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)

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

@@ -239 +239 @@
 endif # neq ($(KBUILD_TARGET),linux)
 
+# 32-bit modules for the 64-bit Linux Additions
+ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
+ ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
+  SYSMODS += vboxmouse_drv_32
+  vboxmouse_drv_32_EXTENDS  = vboxmouse_drv
+  vboxmouse_drv_32_TEMPLATE = VBOXGUESTR3XF86MOD_X86
+  vboxmouse_drv_32_NAME     = vboxmouse_drv
+  $(foreach i,$(filter vboxmouse_drv_%,$(DLLS)),$(eval DLLS += $(i)_32))
+  $(foreach i,$(filter vboxmouse_drv_%_32,$(DLLS)),$(eval $(i)_EXTENDS = $(subst _32,,$(i))))
+  $(foreach i,$(filter vboxmouse_drv_%_32,$(DLLS)),$(eval $(i)_TEMPLATE = VBOXGUESTR3XORGMOD_X86))
+  $(foreach i,$(filter vboxmouse_drv_%_32,$(DLLS)),$(eval $(i)_NAME = $(subst _32,,$(i))))
+ endif
+endif
 
 ifdef VBOX_USE_SYSTEM_XORG_HEADERS

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

@@ -333 +333 @@
 
 
+# 32-bit modules for the 64-bit Linux Additions
+ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
+ ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
+  SYSMODS += vboxvideo_drv_32
+  vboxvideo_drv_32_EXTENDS  = vboxvideo_drv
+  vboxvideo_drv_32_TEMPLATE = VBOXGUESTR3XF86MOD_X86
+  vboxvideo_drv_32_NAME     = vboxvideo_drv
+  $(foreach i,$(filter vboxvideo_drv_%,$(DLLS)),$(eval DLLS += $(i)_32))
+  $(foreach i,$(filter vboxvideo_drv_%_32,$(DLLS)),$(eval $(i)_EXTENDS = $(subst _32,,$(i))))
+  $(foreach i,$(filter vboxvideo_drv_%_32,$(DLLS)),$(eval $(i)_TEMPLATE = VBOXGUESTR3XORGMOD_X86))
+  $(foreach i,$(filter vboxvideo_drv_%_32,$(DLLS)),$(eval $(i)_NAME = $(subst _32,,$(i))))
+ endif
+endif
+
 ifdef VBOX_USE_SYSTEM_XORG_HEADERS
  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
@@ -351 +365 @@
 endif
 
-
 # Check the undefined symbols in the X.Org modules against lists of allowed
 # symbols.  Not very elegant, but it will catch problems early.