VirtualBox

Changeset 98252 in vbox for trunk


Ignore:
Timestamp:
Jan 23, 2023 5:35:06 PM (21 months ago)
Author:
vboxsync
Message:

*.kmk,configure*: s/VBOX_VPX/VBoxLibVpx (sdk) bugref:10348

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r98251 r98252  
    50355035
    50365036ifdef VBOX_WITH_LIBVPX
    5037  SDK_VBOX_VPX                  := libvpx for dll linking.
    5038  SDK_VBOX_VPX_DEFAULT_INCS     := $(PATH_ROOT)/src/libs/libvpx-1.11.0
    5039  SDK_VBOX_VPX_INCS             ?= $(SDK_VBOX_VPX_DEFAULT_INCS)
    5040  SDK_VBOX_VPX_LIBS             ?= $(PATH_STAGE_LIB)/VBox-libvpx$(VBOX_SUFF_LIB)
     5037 SDK_VBoxLibVpx                  := libvpx for dll linking.
     5038 SDK_VBoxLibVpx_DEFAULT_INCS     := $(PATH_ROOT)/src/libs/libvpx-1.11.0
     5039 SDK_VBoxLibVpx_INCS             ?= $(SDK_VBoxLibVpx_DEFAULT_INCS)
     5040 SDK_VBoxLibVpx_LIBS             ?= $(PATH_STAGE_LIB)/VBox-libvpx$(VBOX_SUFF_LIB)
    50415041endif
    50425042
  • trunk/configure

    r98251 r98252  
    17661766      if test_compile "$LIBVPX $I_INCVPX" vpx vpx; then
    17671767        if test_execute; then
    1768           cnf_append "SDK_VBOX_VPX_INCS" "$INCVPX"
    1769           cnf_append "SDK_VBOX_VPX_LIBS" "`strip_l "$LIBVPX"`"
     1768          cnf_append "SDK_VBoxLibVpx_INCS" "$INCVPX"
     1769          cnf_append "SDK_VBoxLibVpx_LIBS" "`strip_l "$LIBVPX"`"
    17701770          fi
    17711771      fi
  • trunk/src/VBox/Main/Makefile.kmk

    r98250 r98252  
    10171017ifdef VBOX_WITH_RECORDING
    10181018 ifdef VBOX_WITH_LIBVPX
    1019   VBoxC_SDKS += VBOX_VPX
     1019  VBoxC_SDKS += VBoxLibVpx
    10201020  VBoxC_DEFS += VBOX_WITH_LIBVPX
    10211021 endif
     
    12721272 VBoxClient-x86_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/win/precomp_vcc.h
    12731273endif
    1274  VBoxClient-x86_SDKS = $(filter-out VBOX_VPX,$(VBoxC_SDKS))
     1274 VBoxClient-x86_SDKS = $(filter-out VBoxLibVpx,$(VBoxC_SDKS))
    12751275 VBoxClient-x86_DEFS = VBOX_COM_INPROC_API_CLIENT \
    12761276        $(filter-out VBOX_WITH_RECORDING VBOX_WITH_AUDIO_RECORDING \
  • trunk/src/libs/Makefile.kmk

    r98251 r98252  
    154154  # libvpx is used for video capture.
    155155  if   defined(VBOX_WITH_LIBVPX) \
    156     && ("$(SDK_VBOX_VPX_INCS)" == "$(SDK_VBOX_VPX_DEFAULT_INCS)")
     156    && ("$(SDK_VBoxLibVpx_INCS)" == "$(SDK_VBoxLibVpx_DEFAULT_INCS)")
    157157   include $(PATH_SUB_CURRENT)/libvpx-1.11.0/Makefile.kmk
    158158  endif
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