VirtualBox

Changeset 75430 in vbox


Ignore:
Timestamp:
Nov 13, 2018 8:46:32 PM (6 years ago)
Author:
vboxsync
Message:

Main/Makefile.kmk: Some cleanups. Fixed VBoxClient-x86 link error (debian testing).

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r75361 r75430  
    6363endif
    6464VBOX_MAIN_DEFS += \
     65        $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA,) \
     66        $(if $(VBOX_WITH_AUDIO_DEBUG),VBOX_WITH_AUDIO_DEBUG,) \
     67        $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS,) \
     68        $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE,) \
     69        $(if $(VBOX_WITH_AUDIO_VALIDATIONKIT),VBOX_WITH_AUDIO_VALIDATIONKIT,) \
     70        $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \
     71        $(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST,) \
     72        $(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI,) \
     73        $(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL,) \
     74        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
     75        $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
     76        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL,) \
     77        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) \
     78        $(if $(VBOX_WITH_GUEST_PROPS_RDONLY_GUEST),VBOX_WITH_GUEST_PROPS_RDONLY_GUEST,) \
     79        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
     80        $(if $(VBOX_WITH_HOSTNETIF_API),VBOX_WITH_HOSTNETIF_API,) \
     81        $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
     82        $(if $(VBOX_WITH_MIDL_PROXY_STUB),VBOX_WITH_MIDL_PROXY_STUB,) \
     83        $(if $(VBOX_WITH_NETFLT),VBOX_WITH_NETFLT,) \
     84        $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
     85        $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
    6586        $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \
    6687        $(if $(VBOX_WITH_RAW_RING1),VBOX_WITH_RAW_RING1,) \
     88        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
     89        $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER,) \
     90        $(if $(VBOX_WITH_USB_CARDREADER_TEST),VBOX_WITH_USB_CARDREADER_TEST,) \
     91        $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO,) \
    6792        $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA,) \
    6893        $(if $(VBOX_WITH_VMSVGA3D),VBOX_WITH_VMSVGA3D,) \
    69         $(if $(VBOX_WITH_NETFLT),VBOX_WITH_NETFLT,) \
    70         $(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST,) \
    71         $(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL,) \
    72         $(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI,) \
    73         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) \
    74         $(if $(VBOX_WITH_GUEST_PROPS_RDONLY_GUEST),VBOX_WITH_GUEST_PROPS_RDONLY_GUEST,) \
    75         $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL,) \
    76         $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER,) \
    77         $(if $(VBOX_WITH_USB_CARDREADER_TEST),VBOX_WITH_USB_CARDREADER_TEST,) \
    78         $(if $(VBOX_WITH_HOSTNETIF_API),VBOX_WITH_HOSTNETIF_API,) \
    79         $(if $(VBOX_WITH_MIDL_PROXY_STUB),VBOX_WITH_MIDL_PROXY_STUB,) \
    80         $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
     94        $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
     95        $(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,)
     96
    8197
    8298# Unconditionally enable the new semaphore key generation code
    … …  
    340356 VBoxSVC_PCH_HDR := $(PATH_SUB_CURRENT)/src-server/win/precomp_vcc.h
    341357endif
     358## r=bird: If you really think you might need VBOX_WITH_RECORDING and VBOX_WITH_AUDIO_RECORDING both here and for
     359##         VBoxC, you shall obviously put them in VBOX_MAIN_DEFS!  So, one way or the other they they disappear from here...
    342360VBoxSVC_DEFS = \
    343361        VBOX_MAIN_SETTINGS_ADDONS \
    … …  
    348366        $(if $(VBOX_WITH_QTGUI),VBOX_WITH_QTGUI,) \
    349367        $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY,) \
    350         $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
    351         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS,) \
    352         $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA,) \
    353         $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE,) \
    354         $(if $(VBOX_WITH_AUDIO_DEBUG),VBOX_WITH_AUDIO_DEBUG,) \
    355         $(if $(VBOX_WITH_AUDIO_VALIDATIONKIT),VBOX_WITH_AUDIO_VALIDATIONKIT,) \
    356368        $(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING,) \
    357369        $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,) \
    358         $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \
    359         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
    360         $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO,) \
    361370        $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) \
    362371        $(if $(VBOX_WITH_LSILOGIC),VBOX_WITH_LSILOGIC,) \
    … …  
    364373        $(if $(VBOX_WITH_RESOURCE_USAGE_API),VBOX_WITH_RESOURCE_USAGE_API,) \
    365374        $(if $(VBOX_WITH_UNATTENDED),VBOX_WITH_UNATTENDED,) \
    366         $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
    367375        $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
    368376        $(if $(VBOX_WITH_DBUS),$(if $(VBOX_USB_WITH_DBUS),VBOX_USB_WITH_DBUS,),) \
    369377        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
    370378        $(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
    371         $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
    372         $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
    373         $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
    374         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
    375379        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE,) \
    376         $(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL,) \
    377         $(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI,) \
    378380        $(if-expr defined(VBOX_WITH_SDS),VBOX_WITH_SDS,)
    379381ifdef VBOX_WITH_USB
    … …  
    754756        $(VBOX_MAIN_DEFS) \
    755757        VBOX_COM_INPROC \
    756         $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
    757         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS,) \
    758         $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA,) \
    759         $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE,) \
    760         $(if $(VBOX_WITH_AUDIO_DEBUG),VBOX_WITH_AUDIO_DEBUG,) \
    761         $(if $(VBOX_WITH_AUDIO_VALIDATIONKIT),VBOX_WITH_AUDIO_VALIDATIONKIT,) \
    762         $(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING,) \
    763         $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,) \
    764         $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \
    765         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
    766         $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO,) \
    767758        $(if $(VBOX_WITH_EFI),VBOX_WITH_EFI,) \
    768         $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
    769         $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
    770         $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
    771759        $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
    772760        $(if $(VBOX_WITH_VIDEOHWACCEL),VBOX_WITH_VIDEOHWACCEL,) \
    … …  
    774762        $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) \
    775763        $(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
    776         $(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
    777         $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
    778         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
    779         $(if $(VBOX_WITH_VRDEAUTH_IN_VBOXSVC),VBOX_WITH_VRDEAUTH_IN_VBOXSVC,) \
    780         $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
     764        $(if $(VBOX_WITH_VRDEAUTH_IN_VBOXSVC),VBOX_WITH_VRDEAUTH_IN_VBOXSVC,)
    781765ifdef VBOX_WITH_CRHGSMI
    782766 VBoxC_DEFS += VBOX_WITH_CRHGSMI
    … …  
    795779VBoxC_SDKS = VBOX_LIBPNG VBOX_ZLIB
    796780
    797 ifdef VBOX_WITH_RECORDING
    798    VBoxC_SOURCES += \
     781if defined(VBOX_WITH_RECORDING) && defined(VBOX_WITH_LIBVPX)
     782VBoxC_SDKS += VBOX_VPX
     783VBoxC_DEFS += VBOX_WITH_RECORDING VBOX_WITH_LIBVPX
     784VBoxC_SOURCES += \
    799785        xml/Settings.cpp \
    800786        src-client/EBMLWriter.cpp \
    801         src-client/WebMWriter.cpp
    802   ifdef VBOX_WITH_LIBVPX
    803    VBoxC_SDKS += VBOX_VPX
    804    VBoxC_DEFS += VBOX_WITH_LIBVPX
    805    VBoxC_SOURCES += \
     787        src-client/WebMWriter.cpp \
    806788        src-client/Recording.cpp \
    807789        src-client/RecordingInternals.cpp \
    808790        src-client/RecordingStream.cpp \
    809791        src-client/RecordingUtils.cpp
    810   else
    811    $(error "VBox: No alternative for VPX when using recording support yet")
    812   endif
    813 endif
    814 
    815 ifdef VBOX_WITH_AUDIO_RECORDING
    816   ifdef VBOX_WITH_LIBOPUS
    817    VBoxC_SDKS += VBOX_OPUS
    818    VBoxC_DEFS += VBOX_WITH_LIBOPUS
    819   else
    820    $(error "VBox: No alternative for Opus when using audio support for recording yet")
    821   endif
    822 endif
     792
     793 if defined(VBOX_WITH_AUDIO_RECORDING) && defined(VBOX_WITH_LIBOPUS)
     794VBoxC_SDKS += VBOX_OPUS
     795VBoxC_DEFS += VBOX_WITH_AUDIO_RECORDING VBOX_WITH_LIBOPUS
     796VBoxC_SOURCES += src-client/DrvAudioRec.cpp
     797 endif
     798endif # VBOX_WITH_RECORDING && VBOX_WITH_LIBVPX
    823799
    824800ifdef VBOX_WITH_OPENSSL_FIPS
    825   VBoxC_SDKS += VBOX_OPENSSL2
     801VBoxC_SDKS += VBOX_OPENSSL2
    826802endif
    827803
    … …  
    932908        ../Devices/Audio/DrvAudioCommon.cpp \
    933909        src-client/AudioDriver.cpp \
    934         $(if $(VBOX_WITH_AUDIO_VRDE),src-client/DrvAudioVRDE.cpp,) \
    935         $(if $(VBOX_WITH_AUDIO_RECORDING),src-client/DrvAudioRec.cpp,)
     910        $(if $(VBOX_WITH_AUDIO_VRDE),src-client/DrvAudioVRDE.cpp,)
    936911
    937912VBoxC_SOURCES.win = \
    … …  
    1022997 VBoxClient-x86_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/win/precomp_vcc.h
    1023998endif
     999 VBoxClient-x86_SDKS = $(filter-out VBOX_OPUS VBOX_VPX,$(VBoxC_SDKS))
    10241000 VBoxClient-x86_DEFS = VBOX_COM_INPROC_API_CLIENT $(VBoxC_DEFS)
    10251001 VBoxClient-x86_INCS.win = \
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