VirtualBox

Changeset 46147 in vbox for trunk/src


Ignore:
Timestamp:
May 17, 2013 3:35:09 PM (12 years ago)
Author:
vboxsync
Message:

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

Location:
trunk/src/VBox
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk

    r45459 r46147  
    4545VBoxControl_LDFLAGS.darwin = -framework IOKit
    4646
     47# 32-bit version for the 64-bit Linux Additions
     48ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     49 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     50  PROGRAMS += VBoxControl_32
     51  VBoxControl_32_EXTENDS  = VBoxControl
     52  VBoxControl_32_TEMPLATE = NewVBoxGuestR3Exe_X86
     53  VBoxControl_32_NAME     = VBoxControl
     54 endif
     55endif
     56
    4757include $(FILE_KBUILD_SUB_FOOTER)
    4858

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

    r43346 r46147  
    4242 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
    4343  LIBRARIES += \
    44         VBoxGuestR3LibXFree86
     44        VBoxGuestR3LibXFree86
    4545 endif
    4646endif
    4747LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
     48ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     49 LIBRARIES.linux.amd64 += \
     50        VBoxGuestR3Lib-x86 \
     51        VBoxGuestR3LibShared-x86 \
     52        VBoxGuestR3LibXFree86-x86
     53endif
    4854
    4955
    … …  
    160166
    161167#
    162 # VBoxGuestR3LibShared-x86 - an x86 (32-bit) variant of VBoxGuestR3LibShared for 64-bit Windows.
     168# VBoxGuestR3LibShared-x86 - an x86 (32-bit) variant of VBoxGuestR3LibShared for 64-bit Linux.
    163169#
    164170VBoxGuestR3LibShared-x86_EXTENDS      := VBoxGuestR3LibShared
    … …  
    197203VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
    198204
     205#
     206# VBoxGuestR3LibXFree86-x86 - an x86 (32-bit) variant of VBoxGuestR3LibXFree86 for 64-bit Linux.
     207#
     208VBoxGuestR3LibXFree86-x86_TEMPLATE     := VBOXGUESTR3XF86LIB_X86
     209VBoxGuestR3LibXFree86-x86_EXTENDS      := VBoxGuestR3LibXFree86
     210
     211
    199212include $(FILE_KBUILD_SUB_FOOTER)
    200213

  • trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

    r45459 r46147  
    122122VBoxService_LDFLAGS.darwin = -framework IOKit
    123123
    124 VBoxService_LIBS        += \
    125         $(VBOX_LIB_IPRT_GUEST_R3) \
    126         $(VBOX_LIB_VBGL_R3) \
    127         $(VBOX_LIB_IPRT_GUEST_R3)       # (The joy of unix linkers.)
    128124if1of ($(KBUILD_TARGET), linux)
    129125 VBoxService_LIBS        += \
    … …  
    145141        kstat \
    146142        contract
     143endif
     144
     145# 32-bit version for the 64-bit Linux Additions
     146ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     147 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     148  PROGRAMS += VBoxService_32
     149  VBoxService_32_EXTENDS  = VBoxService
     150  VBoxService_32_TEMPLATE = NewVBoxGuestR3Exe_X86
     151  VBoxService_32_NAME     = VBoxService
     152 endif
    147153endif
    148154

  • trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

    r43296 r46147  
    4141endif
    4242
     43VBOX_OGL_X86_GUEST_DLLS = \
     44     VBoxOGL-x86 \
     45     VBoxOGLarrayspu-x86 \
     46     VBoxOGLpassthroughspu-x86 \
     47     VBoxOGLpackspu-x86 \
     48     VBoxOGLfeedbackspu-x86
     49
     50ifdef VBOX_WITH_WDDM
     51 DLLS.win.amd64 += VBOX_OGL_X86_GUEST_DLLS
     52endif
     53
     54# 32-bit version for the 64-bit Linux Additions
     55ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     56 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     57  DLLS += $(VBOX_OGL_X86_GUEST_DLLS)
     58  $(foreach i,$(VBOX_OGL_X86_GUEST_DLLS),$(eval $(i)_INST = $(INST_ADDITIONS)/32/))
     59  $(foreach i,$(VBOX_OGL_X86_GUEST_DLLS),$(eval $(i)_NAME = $(subst -x86,,$(i))))
     60 endif
     61endif
     62
    4363if1of ($(KBUILD_TARGET), linux solaris freebsd)
    4464 #VBoxOGL_DRI = 1
    … …  
    5575 endif
    5676endif
    57 
    5877
    5978#
    … …  
    221240endif
    222241
    223 ifdef VBOX_WITH_WDDM
    224242#
    225243# VBoxOGL-x86 - x86 VBoxOGL version built for amd64 build
    226244#
    227 DLLS.win.amd64 += VBoxOGL-x86
    228245VBoxOGL-x86_EXTENDS = VBoxOGL
    229246VBoxOGL-x86_BLD_TRG_ARCH = x86
    … …  
    235252VBoxOGL-x86_CLEAN.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_CLEAN.win))
    236253VBoxOGL-x86_DEFS = $(VBoxOGL_DEFS) VBOX_WDDM_WOW64
    237 endif
    238254
    239255#
    … …  
    417433endif
    418434
    419 ifdef VBOX_WITH_WDDM
    420435#
    421436# VBoxOGLarrayspu-x86 - x86 version of VBoxOGLarrayspu built for amd64 build
    422437#
    423 DLLS.win.amd64 += VBoxOGLarrayspu-x86
    424438VBoxOGLarrayspu-x86_EXTENDS = VBoxOGLarrayspu
    425439VBoxOGLarrayspu-x86_BLD_TRG_ARCH = x86
    … …  
    428442        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
    429443VBoxOGLarrayspu-x86_DEFS = $(VBoxOGLarrayspu_DEFS) VBOX_WDDM_WOW64
    430 endif
    431444
    432445#
    … …  
    461474endif
    462475
    463 ifdef VBOX_WITH_WDDM
    464476#
    465477# VBoxOGLpassthroughspu-x86 - x86 version of VBoxOGLpassthroughspu built for amd64 build
    466478#
    467 DLLS.win.amd64 += VBoxOGLpassthroughspu-x86
    468479VBoxOGLpassthroughspu-x86_EXTENDS = VBoxOGLpassthroughspu
    469480VBoxOGLpassthroughspu-x86_BLD_TRG_ARCH = x86
    470481VBoxOGLpassthroughspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86)
    471482VBoxOGLpassthroughspu-x86_DEFS = $(VBoxOGLpassthroughspu_DEFS) VBOX_WDDM_WOW64
    472 endif
    473483
    474484#
    … …  
    537547endif
    538548
    539 ifdef VBOX_WITH_WDDM
    540549#
    541550# VBoxOGLpackspu-x86 - x86 version of VBoxOGLpackspu built for amd64 build
    542551#
    543 DLLS.win.amd64 += VBoxOGLpackspu-x86
    544552VBoxOGLpackspu-x86_EXTENDS = VBoxOGLpackspu
    545553VBoxOGLpackspu-x86_BLD_TRG_ARCH = x86
    … …  
    549557        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB)
    550558VBoxOGLpackspu-x86_DEFS = $(VBoxOGLpackspu_DEFS) VBOX_WDDM_WOW64
    551 endif
    552559
    553560#
    … …  
    614621endif
    615622
    616 ifdef VBOX_WITH_WDDM
    617623#
    618624# VBoxOGLfeedbackspu-x86 - x86 version of VBoxOGLfeedbackspu built for amd64 build
    619625#
    620 DLLS.win.amd64 += VBoxOGLfeedbackspu-x86
    621626VBoxOGLfeedbackspu-x86_EXTENDS = VBoxOGLfeedbackspu
    622627VBoxOGLfeedbackspu-x86_BLD_TRG_ARCH = x86
    … …  
    625630        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
    626631VBoxOGLfeedbackspu-x86_DEFS = $(VBoxOGLfeedbackspu_DEFS) VBOX_WDDM_WOW64
    627 endif
    628632
    629633#

  • trunk/src/VBox/Additions/common/pam/Makefile.kmk

    r41477 r46147  
    3333        $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
    3434
     35# 32-bit version for the 64-bit Linux Additions
     36ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     37 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     38  DLLS += pam_vbox_32
     39  pam_vbox_32_EXTENDS  = pam_vbox
     40  pam_vbox_32_TEMPLATE = VBOXGUESTR3DLL_X86
     41  pam_vbox_32_NAME     = pam_vbox
     42  pam_vbox_32_LIBS = \
     43        pam \
     44        $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
     45        $(VBOX_LIB_VBGL_R3_SHARED_X86) \
     46        $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86)
     47 endif
     48endif
     49
    3550include $(FILE_KBUILD_SUB_FOOTER)

  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

    r42239 r46147  
    8282        vbsfmount.c
    8383
     84# 32-bit version for the 64-bit Linux Additions
     85ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     86 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     87  PROGRAMS += mount.vboxsf_32
     88  mount.vboxsf_32_EXTENDS  = mount.vboxsf
     89  mount.vboxsf_32_TEMPLATE = NewVBoxGuestR3Exe_X86
     90  mount.vboxsf_32_NAME     = mount.vboxsf
     91 endif
     92endif
     93
    8494include $(FILE_KBUILD_SUB_FOOTER)
    8595

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

    r42261 r46147  
    7676endif
    7777
     78# 32-bit version for the 64-bit Linux Additions
     79ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     80 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     81  PROGRAMS += VBoxClient_32
     82  VBoxClient_32_EXTENDS  = VBoxClient
     83  VBoxClient_32_TEMPLATE = NewVBoxGuestR3Exe_X86
     84  VBoxClient_32_NAME     = VBoxClient
     85 endif
     86endif
     87
    7888ifdef VBOX_X11_SEAMLESS_GUEST
    7989 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)

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

    r44528 r46147  
    239239endif # neq ($(KBUILD_TARGET),linux)
    240240
     241# 32-bit modules for the 64-bit Linux Additions
     242ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     243 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     244  SYSMODS += vboxmouse_drv_32
     245  vboxmouse_drv_32_EXTENDS  = vboxmouse_drv
     246  vboxmouse_drv_32_TEMPLATE = VBOXGUESTR3XF86MOD_X86
     247  vboxmouse_drv_32_NAME     = vboxmouse_drv
     248  $(foreach i,$(filter vboxmouse_drv_%,$(DLLS)),$(eval DLLS += $(i)_32))
     249  $(foreach i,$(filter vboxmouse_drv_%_32,$(DLLS)),$(eval $(i)_EXTENDS = $(subst _32,,$(i))))
     250  $(foreach i,$(filter vboxmouse_drv_%_32,$(DLLS)),$(eval $(i)_TEMPLATE = VBOXGUESTR3XORGMOD_X86))
     251  $(foreach i,$(filter vboxmouse_drv_%_32,$(DLLS)),$(eval $(i)_NAME = $(subst _32,,$(i))))
     252 endif
     253endif
    241254
    242255ifdef VBOX_USE_SYSTEM_XORG_HEADERS

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

    r46021 r46147  
    333333
    334334
     335# 32-bit modules for the 64-bit Linux Additions
     336ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     337 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     338  SYSMODS += vboxvideo_drv_32
     339  vboxvideo_drv_32_EXTENDS  = vboxvideo_drv
     340  vboxvideo_drv_32_TEMPLATE = VBOXGUESTR3XF86MOD_X86
     341  vboxvideo_drv_32_NAME     = vboxvideo_drv
     342  $(foreach i,$(filter vboxvideo_drv_%,$(DLLS)),$(eval DLLS += $(i)_32))
     343  $(foreach i,$(filter vboxvideo_drv_%_32,$(DLLS)),$(eval $(i)_EXTENDS = $(subst _32,,$(i))))
     344  $(foreach i,$(filter vboxvideo_drv_%_32,$(DLLS)),$(eval $(i)_TEMPLATE = VBOXGUESTR3XORGMOD_X86))
     345  $(foreach i,$(filter vboxvideo_drv_%_32,$(DLLS)),$(eval $(i)_NAME = $(subst _32,,$(i))))
     346 endif
     347endif
     348
    335349ifdef VBOX_USE_SYSTEM_XORG_HEADERS
    336350 # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
    … …  
    351365endif
    352366
    353 
    354367# Check the undefined symbols in the X.Org modules against lists of allowed
    355368# symbols.  Not very elegant, but it will catch problems early.

  • trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

    r46021 r46147  
    4141 DLLS      += VBoxOGLhostcrutil VBoxOGLhosterrorspu
    4242 LIBRARIES += VBoxOGLhostcrpacker VBoxOGLhostspuload VBoxOGLhostcrstate
     43endif
     44
     45VBOX_OGL_X86_COMMON_DLLS = \
     46    VBoxOGLcrutil-x86 \
     47    VBoxOGLerrorspu-x86
     48VBOX_OGL_X86_COMMON_LIBS = \
     49    VBoxOGLcrpacker-x86 \
     50    VBoxOGLspuload-x86 \
     51    VBoxOGLcrstate-x86
     52if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
     53 DLLS.win.amd64 += $(VBOX_OGL_X86_COMMON_DLLS)
     54endif
     55if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
     56 LIBRARIES.win.amd64 += $(VBOX_OGL_X86_COMMON_LIBS)
     57endif
     58# 32-bit version for the 64-bit Linux Additions
     59ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     60 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     61  LIBRARIES += $(VBOX_OGL_X86_COMMON_LIBS)
     62  DLLS += $(VBOX_OGL_X86_COMMON_DLLS)
     63  $(foreach i,$(VBOX_OGL_X86_COMMON_DLLS),$(eval $(i)_INST = $(INST_ADDITIONS)/32/))
     64  $(foreach i,$(VBOX_OGL_X86_COMMON_DLLS),$(eval $(i)_NAME = $(subst -x86,,$(i))))
     65 endif
    4366endif
    4467
    … …  
    113136VBoxOGLhostcrutil_pixel.c_CFLAGS.win.x86 += -Od
    114137
    115 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    116138#
    117139# VBoxOGLcrutil-x86 - x86 VBoxOGLcrutil version built for amd64 build
    118140#
    119 DLLS.win.amd64 += VBoxOGLcrutil-x86
    120141VBoxOGLcrutil-x86_TEMPLATE      = VBOXCROGLR3GUESTDLL
    121142VBoxOGLcrutil-x86_EXTENDS = VBoxOGLcrutil
    … …  
    139160VBoxOGLcrutil-x86_pixel.c_CFLAGS += -Od
    140161VBoxOGLcrutil-x86_pixel.c_CFLAGS += -Od
    141 endif
    142162
    143163#
    … …  
    268288endif
    269289
    270 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    271290#
    272291# VBoxOGLcrpacker-x86 - x86 VBoxOGLcrpacker version built for amd64 build
    273292#
    274 LIBRARIES.win.amd64 += VBoxOGLcrpacker-x86
    275293VBoxOGLcrpacker-x86_TEMPLATE = VBOXCROGLR3GUESTLIB
    276294VBoxOGLcrpacker-x86_EXTENDS = VBoxOGLcrpacker
    277295VBoxOGLcrpacker-x86_BLD_TRG_ARCH = x86
    278296VBoxOGLcrpacker-x86_DEFS = $(VBoxOGLcrpacker_DEFS) VBOX_WDDM_WOW64
    279 endif
    280297
    281298#
    … …  
    352369endif
    353370
    354 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    355371#
    356372# VBoxOGLspuload-x86 - x86 VBoxOGLspuload version built for amd64 build
    357373#
    358 LIBRARIES.win.amd64 += VBoxOGLspuload-x86
    359374VBoxOGLspuload-x86_TEMPLATE = VBOXCROGLR3GUESTLIB
    360375VBoxOGLspuload-x86_EXTENDS = VBoxOGLspuload
    361376VBoxOGLspuload-x86_BLD_TRG_ARCH = x86
    362377VBoxOGLspuload-x86_DEFS = $(VBoxOGLspuload_DEFS) VBOX_WDDM_WOW64
    363 endif
    364378
    365379
    … …  
    486500endif
    487501
    488 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    489502#
    490503# VBoxOGLcrstate-x86 - x86 VBoxOGLcrstate version built for amd64 build
    491504#
    492 LIBRARIES.win.amd64 += VBoxOGLcrstate-x86
    493505VBoxOGLcrstate-x86_TEMPLATE = VBOXCROGLR3GUESTLIB
    494506VBoxOGLcrstate-x86_EXTENDS = VBoxOGLcrstate
    495507VBoxOGLcrstate-x86_BLD_TRG_ARCH = x86
    496508VBoxOGLcrstate-x86_DEFS = $(VBoxOGLcrstate_DEFS) VBOX_WDDM_WOW64
    497 endif
    498509
    499510
    … …  
    611622
    612623
    613 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    614624#
    615625# VBoxOGLerrorspu-x86 - x86 VBoxOGLerrorspu version built for amd64 build
    616626#
    617 DLLS.win.amd64 += VBoxOGLerrorspu-x86
    618627VBoxOGLerrorspu-x86_TEMPLATE = VBOXCROGLR3GUESTDLL
    619628VBoxOGLerrorspu-x86_EXTENDS = VBoxOGLerrorspu
    … …  
    622631        $(VBOX_LIB_OGL_CRUTIL_X86)
    623632VBoxOGLerrorspu-x86_DEFS = $(VBoxOGLerrorspu_DEFS) VBOX_WDDM_WOW64
    624 endif
    625633
    626634#

  • trunk/src/VBox/Runtime/Makefile.kmk

    r46144 r46147  
    3838  #LIBRARIES.os2 += RuntimeGuestR0OS2Warp3
    3939  LIBRARIES.win.x86 += RuntimeGuestR0NT4
     40 endif
     41 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     42  LIBRARIES.linux.amd64 += \
     43      RuntimeGuestR3-x86 \
     44      RuntimeGuestR3Mini-x86 \
     45      RuntimeGuestR3Shared-x86
    4046 endif
    4147
    … …  
    8894  LIBRARIES += RuntimeGuestR3 RuntimeGuestR3Shared RuntimeGuestR3Mini
    8995  LIBRARIES.win.amd64 += RuntimeGuestR3-x86 RuntimeGuestR3Shared-x86
     96  ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
     97   LIBRARIES.linux.amd64 += \
     98      RuntimeGuestR3-x86 \
     99      RuntimeGuestR3Mini-x86 \
     100      RuntimeGuestR3Shared-x86
     101  endif
    90102  ifdef VBOX_WITH_ADDITION_DRIVERS
    91103   LIBRARIES += RuntimeGuestR0
    … …  
    12301242        win/RTErrConvertFromWin32.cpp
    12311243
     1244#
     1245# RuntimeGuestR3Mini-x86 - Same as RuntimeGuestR3Mini, except that it's targeting x86.
     1246#
     1247RuntimeGuestR3Mini-x86_EXTENDS        := RuntimeGuestR3Mini
     1248RuntimeGuestR3Mini-x86_BLD_TRG_ARCH   := x86
     1249
     1250
    12321251# VBox specific stuff.
    12331252RuntimeGuestR3Mini_SOURCES += \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette