VirtualBox

Changeset 49643 in vbox for trunk/src


Ignore:
Timestamp:
Nov 25, 2013 3:46:54 PM (11 years ago)
Author:
vboxsync
Message:

Additions/linux: back out single bit-count Additions package experiment.

Location:
trunk/src/VBox
Files:
11 edited

Legend:

Unmodified
Added
Removed

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

    r46147 r49643  
    4545VBoxControl_LDFLAGS.darwin = -framework IOKit
    4646
    47 # 32-bit version for the 64-bit Linux Additions
    48 ifeq ($(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
    55 endif
    56 
    5747include $(FILE_KBUILD_SUB_FOOTER)
    5848

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

    r47294 r49643  
    4242 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
    4343  LIBRARIES += \
    44         VBoxGuestR3LibXFree86
     44        VBoxGuestR3LibXFree86
    4545 endif
    4646endif
    4747LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
    48 ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
    49  LIBRARIES.linux.amd64 += \
    50         VBoxGuestR3Lib-x86 \
    51         VBoxGuestR3LibShared-x86 \
    52         VBoxGuestR3LibXFree86-x86
    53 endif
    5448
    5549
    … …  
    167161
    168162#
    169 # VBoxGuestR3LibShared-x86 - an x86 (32-bit) variant of VBoxGuestR3LibShared for 64-bit Linux.
     163# VBoxGuestR3LibShared-x86 - an x86 (32-bit) variant of VBoxGuestR3LibShared for 64-bit Windows.
    170164#
    171165VBoxGuestR3LibShared-x86_EXTENDS      := VBoxGuestR3LibShared
    … …  
    204198VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
    205199
    206 #
    207 # VBoxGuestR3LibXFree86-x86 - an x86 (32-bit) variant of VBoxGuestR3LibXFree86 for 64-bit Linux.
    208 #
    209 VBoxGuestR3LibXFree86-x86_TEMPLATE     := VBOXGUESTR3XF86LIB_X86
    210 VBoxGuestR3LibXFree86-x86_EXTENDS      := VBoxGuestR3LibXFree86
    211 
    212 
    213200include $(FILE_KBUILD_SUB_FOOTER)
    214201

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

    r46506 r49643  
    122122VBoxService_LDFLAGS.darwin = -framework IOKit
    123123
     124VBoxService_LIBS        += \
     125        $(VBOX_LIB_IPRT_GUEST_R3) \
     126        $(VBOX_LIB_VBGL_R3) \
     127        $(VBOX_LIB_IPRT_GUEST_R3)       # (The joy of unix linkers.)
    124128if1of ($(KBUILD_TARGET), linux)
    125129 VBoxService_LIBS        += \
    … …  
    141145        kstat \
    142146        contract
    143 endif
    144 
    145 # 32-bit version for the 64-bit Linux Additions
    146 ifeq ($(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
    153147endif
    154148

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

    r49264 r49643  
    7575 endif
    7676endif
     77
    7778
    7879#
    … …  
    245246endif
    246247
     248ifdef VBOX_WITH_WDDM
    247249#
    248250# VBoxOGL-x86 - x86 VBoxOGL version built for amd64 build
    249251#
     252DLLS.win.amd64 += VBoxOGL-x86
    250253VBoxOGL-x86_EXTENDS = VBoxOGL
    251254VBoxOGL-x86_BLD_TRG_ARCH = x86
    … …  
    257260VBoxOGL-x86_CLEAN.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_CLEAN.win))
    258261VBoxOGL-x86_DEFS = $(VBoxOGL_DEFS) VBOX_WDDM_WOW64
     262endif
    259263
    260264#
    … …  
    470474endif
    471475
     476ifdef VBOX_WITH_WDDM
    472477#
    473478# VBoxOGLarrayspu-x86 - x86 version of VBoxOGLarrayspu built for amd64 build
    474479#
     480DLLS.win.amd64 += VBoxOGLarrayspu-x86
    475481VBoxOGLarrayspu-x86_EXTENDS = VBoxOGLarrayspu
    476482VBoxOGLarrayspu-x86_BLD_TRG_ARCH = x86
    … …  
    479485        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
    480486VBoxOGLarrayspu-x86_DEFS = $(VBoxOGLarrayspu_DEFS) VBOX_WDDM_WOW64
     487endif
    481488
    482489#
    … …  
    511518endif
    512519
     520ifdef VBOX_WITH_WDDM
    513521#
    514522# VBoxOGLpassthroughspu-x86 - x86 version of VBoxOGLpassthroughspu built for amd64 build
    515523#
     524DLLS.win.amd64 += VBoxOGLpassthroughspu-x86
    516525VBoxOGLpassthroughspu-x86_EXTENDS = VBoxOGLpassthroughspu
    517526VBoxOGLpassthroughspu-x86_BLD_TRG_ARCH = x86
    518527VBoxOGLpassthroughspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86)
    519528VBoxOGLpassthroughspu-x86_DEFS = $(VBoxOGLpassthroughspu_DEFS) VBOX_WDDM_WOW64
     529endif
    520530
    521531#
    … …  
    590600endif
    591601
     602ifdef VBOX_WITH_WDDM
    592603#
    593604# VBoxOGLpackspu-x86 - x86 version of VBoxOGLpackspu built for amd64 build
    594605#
     606DLLS.win.amd64 += VBoxOGLpackspu-x86
    595607VBoxOGLpackspu-x86_EXTENDS = VBoxOGLpackspu
    596608VBoxOGLpackspu-x86_BLD_TRG_ARCH = x86
    … …  
    600612        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB)
    601613VBoxOGLpackspu-x86_DEFS = $(VBoxOGLpackspu_DEFS) VBOX_WDDM_WOW64
     614endif
    602615
    603616#
    … …  
    664677endif
    665678
     679ifdef VBOX_WITH_WDDM
    666680#
    667681# VBoxOGLfeedbackspu-x86 - x86 version of VBoxOGLfeedbackspu built for amd64 build
    668682#
     683DLLS.win.amd64 += VBoxOGLfeedbackspu-x86
    669684VBoxOGLfeedbackspu-x86_EXTENDS = VBoxOGLfeedbackspu
    670685VBoxOGLfeedbackspu-x86_BLD_TRG_ARCH = x86
    … …  
    673688        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
    674689VBoxOGLfeedbackspu-x86_DEFS = $(VBoxOGLfeedbackspu_DEFS) VBOX_WDDM_WOW64
     690endif
    675691
    676692#

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

    r46147 r49643  
    3333        $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
    3434
    35 # 32-bit version for the 64-bit Linux Additions
    36 ifeq ($(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
    48 endif
    49 
    5035include $(FILE_KBUILD_SUB_FOOTER)

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

    r46147 r49643  
    8282        vbsfmount.c
    8383
    84 # 32-bit version for the 64-bit Linux Additions
    85 ifeq ($(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
    92 endif
    93 
    9484include $(FILE_KBUILD_SUB_FOOTER)
    9585

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

    r46147 r49643  
    7676endif
    7777
    78 # 32-bit version for the 64-bit Linux Additions
    79 ifeq ($(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
    86 endif
    87 
    8878ifdef VBOX_X11_SEAMLESS_GUEST
    8979 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)

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

    r49175 r49643  
    233233endif # neq ($(KBUILD_TARGET),linux)
    234234
    235 # 32-bit modules for the 64-bit Linux Additions
    236 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
    237  ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
    238   SYSMODS += vboxmouse_drv_32
    239   vboxmouse_drv_32_EXTENDS  = vboxmouse_drv
    240   vboxmouse_drv_32_TEMPLATE = VBOXGUESTR3XF86MOD_X86
    241   vboxmouse_drv_32_NAME     = vboxmouse_drv
    242   $(foreach i,$(filter vboxmouse_drv_%,$(DLLS)),$(eval DLLS += $(i)_32))
    243   $(foreach i,$(filter vboxmouse_drv_%_32,$(DLLS)),$(eval $(i)_EXTENDS = $(subst _32,,$(i))))
    244   $(foreach i,$(filter vboxmouse_drv_%_32,$(DLLS)),$(eval $(i)_TEMPLATE = VBOXGUESTR3XORGMOD_X86))
    245   $(foreach i,$(filter vboxmouse_drv_%_32,$(DLLS)),$(eval $(i)_NAME = $(subst _32,,$(i))))
    246  endif
    247 endif
    248235
    249236ifdef VBOX_USE_SYSTEM_XORG_HEADERS

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

    r49189 r49643  
    348348
    349349
    350 # 32-bit modules for the 64-bit Linux Additions
    351 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
    352  ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
    353   SYSMODS += vboxvideo_drv_32
    354   vboxvideo_drv_32_EXTENDS  = vboxvideo_drv
    355   vboxvideo_drv_32_TEMPLATE = VBOXGUESTR3XF86MOD_X86
    356   vboxvideo_drv_32_NAME     = vboxvideo_drv
    357   $(foreach i,$(filter vboxvideo_drv_%,$(DLLS)),$(eval DLLS += $(i)_32))
    358   $(foreach i,$(filter vboxvideo_drv_%_32,$(DLLS)),$(eval $(i)_EXTENDS = $(subst _32,,$(i))))
    359   $(foreach i,$(filter vboxvideo_drv_%_32,$(DLLS)),$(eval $(i)_TEMPLATE = VBOXGUESTR3XORGMOD_X86))
    360   $(foreach i,$(filter vboxvideo_drv_%_32,$(DLLS)),$(eval $(i)_NAME = $(subst _32,,$(i))))
    361  endif
    362 endif
    363 
    364350ifdef VBOX_USE_SYSTEM_XORG_HEADERS
    365351 # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
    … …  
    380366endif
    381367
     368
    382369# Check the undefined symbols in the X.Org modules against lists of allowed
    383370# symbols.  Not very elegant, but it will catch problems early.

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

    r48951 r49643  
    4141 DLLS      += VBoxOGLhostcrutil VBoxOGLhosterrorspu
    4242 LIBRARIES += VBoxOGLhostcrpacker VBoxOGLhostspuload VBoxOGLhostcrstate
    43 endif
    44 
    45 VBOX_OGL_X86_COMMON_DLLS = \
    46     VBoxOGLcrutil-x86 \
    47     VBoxOGLerrorspu-x86
    48 VBOX_OGL_X86_COMMON_LIBS = \
    49     VBoxOGLcrpacker-x86 \
    50     VBoxOGLspuload-x86 \
    51     VBoxOGLcrstate-x86
    52 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    53  DLLS.win.amd64 += $(VBOX_OGL_X86_COMMON_DLLS)
    54 endif
    55 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    56  LIBRARIES.win.amd64 += $(VBOX_OGL_X86_COMMON_LIBS)
    57 endif
    58 # 32-bit version for the 64-bit Linux Additions
    59 ifeq ($(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
    6643endif
    6744
    … …  
    142119VBoxOGLhostcrutil_pixel.c_CFLAGS.win.x86 += -Od
    143120
     121if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    144122#
    145123# VBoxOGLcrutil-x86 - x86 VBoxOGLcrutil version built for amd64 build
    146124#
     125DLLS.win.amd64 += VBoxOGLcrutil-x86
    147126VBoxOGLcrutil-x86_TEMPLATE      = VBOXCROGLR3GUESTDLL
    148127VBoxOGLcrutil-x86_EXTENDS = VBoxOGLcrutil
    … …  
    166145VBoxOGLcrutil-x86_pixel.c_CFLAGS += -Od
    167146VBoxOGLcrutil-x86_pixel.c_CFLAGS += -Od
     147endif
    168148
    169149#
    … …  
    300280endif
    301281
     282if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    302283#
    303284# VBoxOGLcrpacker-x86 - x86 VBoxOGLcrpacker version built for amd64 build
    304285#
     286LIBRARIES.win.amd64 += VBoxOGLcrpacker-x86
    305287VBoxOGLcrpacker-x86_TEMPLATE = VBOXCROGLR3GUESTLIB
    306288VBoxOGLcrpacker-x86_EXTENDS = VBoxOGLcrpacker
    307289VBoxOGLcrpacker-x86_BLD_TRG_ARCH = x86
    308290VBoxOGLcrpacker-x86_DEFS = $(VBoxOGLcrpacker_DEFS) VBOX_WDDM_WOW64
     291endif
    309292
    310293#
    … …  
    381364endif
    382365
     366if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    383367#
    384368# VBoxOGLspuload-x86 - x86 VBoxOGLspuload version built for amd64 build
    385369#
     370LIBRARIES.win.amd64 += VBoxOGLspuload-x86
    386371VBoxOGLspuload-x86_TEMPLATE = VBOXCROGLR3GUESTLIB
    387372VBoxOGLspuload-x86_EXTENDS = VBoxOGLspuload
    388373VBoxOGLspuload-x86_BLD_TRG_ARCH = x86
    389374VBoxOGLspuload-x86_DEFS = $(VBoxOGLspuload_DEFS) VBOX_WDDM_WOW64
     375endif
    390376
    391377
    … …  
    527513endif
    528514
     515if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    529516#
    530517# VBoxOGLcrstate-x86 - x86 VBoxOGLcrstate version built for amd64 build
    531518#
     519LIBRARIES.win.amd64 += VBoxOGLcrstate-x86
    532520VBoxOGLcrstate-x86_TEMPLATE = VBOXCROGLR3GUESTLIB
    533521VBoxOGLcrstate-x86_EXTENDS = VBoxOGLcrstate
    534522VBoxOGLcrstate-x86_BLD_TRG_ARCH = x86
    535523VBoxOGLcrstate-x86_DEFS = $(VBoxOGLcrstate_DEFS) VBOX_WDDM_WOW64
     524endif
    536525
    537526
    … …  
    649638
    650639
     640if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    651641#
    652642# VBoxOGLerrorspu-x86 - x86 VBoxOGLerrorspu version built for amd64 build
    653643#
     644DLLS.win.amd64 += VBoxOGLerrorspu-x86
    654645VBoxOGLerrorspu-x86_TEMPLATE = VBOXCROGLR3GUESTDLL
    655646VBoxOGLerrorspu-x86_EXTENDS = VBoxOGLerrorspu
    … …  
    658649        $(VBOX_LIB_OGL_CRUTIL_X86)
    659650VBoxOGLerrorspu-x86_DEFS = $(VBoxOGLerrorspu_DEFS) VBOX_WDDM_WOW64
     651endif
    660652
    661653#

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

    r49547 r49643  
    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
    4640 endif
    4741
    … …  
    9488  LIBRARIES += RuntimeGuestR3 RuntimeGuestR3Shared RuntimeGuestR3Mini
    9589  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
    10290  ifdef VBOX_WITH_ADDITION_DRIVERS
    10391   LIBRARIES += RuntimeGuestR0
    … …  
    12821270        win/RTErrConvertFromWin32.cpp
    12831271
    1284 #
    1285 # RuntimeGuestR3Mini-x86 - Same as RuntimeGuestR3Mini, except that it's targeting x86.
    1286 #
    1287 RuntimeGuestR3Mini-x86_EXTENDS        := RuntimeGuestR3Mini
    1288 RuntimeGuestR3Mini-x86_BLD_TRG_ARCH   := x86
    1289 
    1290 
    12911272# VBox specific stuff.
    12921273RuntimeGuestR3Mini_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