- Timestamp:
- Jan 23, 2023 5:35:06 PM (21 months ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
Config.kmk (modified) (1 diff)
-
configure (modified) (1 diff)
-
src/VBox/Main/Makefile.kmk (modified) (2 diffs)
-
src/libs/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r98251 r98252 5035 5035 5036 5036 ifdef VBOX_WITH_LIBVPX 5037 SDK_VB OX_VPX:= libvpx for dll linking.5038 SDK_VB OX_VPX_DEFAULT_INCS := $(PATH_ROOT)/src/libs/libvpx-1.11.05039 SDK_VB OX_VPX_INCS ?= $(SDK_VBOX_VPX_DEFAULT_INCS)5040 SDK_VB OX_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) 5041 5041 endif 5042 5042 -
trunk/configure
r98251 r98252 1766 1766 if test_compile "$LIBVPX $I_INCVPX" vpx vpx; then 1767 1767 if test_execute; then 1768 cnf_append "SDK_VB OX_VPX_INCS" "$INCVPX"1769 cnf_append "SDK_VB OX_VPX_LIBS" "`strip_l "$LIBVPX"`"1768 cnf_append "SDK_VBoxLibVpx_INCS" "$INCVPX" 1769 cnf_append "SDK_VBoxLibVpx_LIBS" "`strip_l "$LIBVPX"`" 1770 1770 fi 1771 1771 fi -
trunk/src/VBox/Main/Makefile.kmk
r98250 r98252 1017 1017 ifdef VBOX_WITH_RECORDING 1018 1018 ifdef VBOX_WITH_LIBVPX 1019 VBoxC_SDKS += VB OX_VPX1019 VBoxC_SDKS += VBoxLibVpx 1020 1020 VBoxC_DEFS += VBOX_WITH_LIBVPX 1021 1021 endif … … 1272 1272 VBoxClient-x86_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/win/precomp_vcc.h 1273 1273 endif 1274 VBoxClient-x86_SDKS = $(filter-out VB OX_VPX,$(VBoxC_SDKS))1274 VBoxClient-x86_SDKS = $(filter-out VBoxLibVpx,$(VBoxC_SDKS)) 1275 1275 VBoxClient-x86_DEFS = VBOX_COM_INPROC_API_CLIENT \ 1276 1276 $(filter-out VBOX_WITH_RECORDING VBOX_WITH_AUDIO_RECORDING \ -
trunk/src/libs/Makefile.kmk
r98251 r98252 154 154 # libvpx is used for video capture. 155 155 if defined(VBOX_WITH_LIBVPX) \ 156 && ("$(SDK_VB OX_VPX_INCS)" == "$(SDK_VBOX_VPX_DEFAULT_INCS)")156 && ("$(SDK_VBoxLibVpx_INCS)" == "$(SDK_VBoxLibVpx_DEFAULT_INCS)") 157 157 include $(PATH_SUB_CURRENT)/libvpx-1.11.0/Makefile.kmk 158 158 endif
Note:
See TracChangeset
for help on using the changeset viewer.

