diff options
| -rw-r--r-- | Config.kmk | 8 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | src/VBox/Main/Makefile.kmk | 4 | ||||
| -rw-r--r-- | src/libs/Makefile.kmk | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Config.kmk b/Config.kmk index afbb3a47a6c..99757f6f81e 100644 --- a/Config.kmk +++ b/Config.kmk @@ -5034,10 +5034,10 @@ ifdef VBOX_WITH_LIBTPMS endif ifdef VBOX_WITH_LIBVPX - SDK_VBOX_VPX := libvpx for dll linking. - SDK_VBOX_VPX_DEFAULT_INCS := $(PATH_ROOT)/src/libs/libvpx-1.11.0 - SDK_VBOX_VPX_INCS ?= $(SDK_VBOX_VPX_DEFAULT_INCS) - SDK_VBOX_VPX_LIBS ?= $(PATH_STAGE_LIB)/VBox-libvpx$(VBOX_SUFF_LIB) + SDK_VBoxLibVpx := libvpx for dll linking. + SDK_VBoxLibVpx_DEFAULT_INCS := $(PATH_ROOT)/src/libs/libvpx-1.11.0 + SDK_VBoxLibVpx_INCS ?= $(SDK_VBoxLibVpx_DEFAULT_INCS) + SDK_VBoxLibVpx_LIBS ?= $(PATH_STAGE_LIB)/VBox-libvpx$(VBOX_SUFF_LIB) endif # libxml2 diff --git a/configure b/configure index e8d57ffe902..c0af18a65ee 100755 --- a/configure +++ b/configure @@ -1765,8 +1765,8 @@ EOF [ -n "$INCVPX" ] && I_INCVPX=`prefix_I "$INCVPX"` if test_compile "$LIBVPX $I_INCVPX" vpx vpx; then if test_execute; then - cnf_append "SDK_VBOX_VPX_INCS" "$INCVPX" - cnf_append "SDK_VBOX_VPX_LIBS" "`strip_l "$LIBVPX"`" + cnf_append "SDK_VBoxLibVpx_INCS" "$INCVPX" + cnf_append "SDK_VBoxLibVpx_LIBS" "`strip_l "$LIBVPX"`" fi fi fi diff --git a/src/VBox/Main/Makefile.kmk b/src/VBox/Main/Makefile.kmk index 8b5dcbda91a..ba824fbd412 100644 --- a/src/VBox/Main/Makefile.kmk +++ b/src/VBox/Main/Makefile.kmk @@ -1016,7 +1016,7 @@ VBoxC_SDKS = VBoxLibPng VBOX_ZLIB ifdef VBOX_WITH_RECORDING ifdef VBOX_WITH_LIBVPX - VBoxC_SDKS += VBOX_VPX + VBoxC_SDKS += VBoxLibVpx VBoxC_DEFS += VBOX_WITH_LIBVPX endif VBoxC_SOURCES += \ @@ -1271,7 +1271,7 @@ if defined(VBOX_WITH_PRECOMPILED_HEADERS) && "$(KBUILD_TARGET)" == "win" ## @tod VBoxClient-x86_USES = vccprecomp VBoxClient-x86_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/win/precomp_vcc.h endif - VBoxClient-x86_SDKS = $(filter-out VBOX_VPX,$(VBoxC_SDKS)) + VBoxClient-x86_SDKS = $(filter-out VBoxLibVpx,$(VBoxC_SDKS)) VBoxClient-x86_DEFS = VBOX_COM_INPROC_API_CLIENT \ $(filter-out VBOX_WITH_RECORDING VBOX_WITH_AUDIO_RECORDING \ VBOX_WITH_LIBVPX,$(VBoxC_DEFS)) diff --git a/src/libs/Makefile.kmk b/src/libs/Makefile.kmk index c688ddd0759..1decd49a3a6 100644 --- a/src/libs/Makefile.kmk +++ b/src/libs/Makefile.kmk @@ -153,7 +153,7 @@ if defined(VBOX_WITH_MAIN) \ # libvpx is used for video capture. if defined(VBOX_WITH_LIBVPX) \ - && ("$(SDK_VBOX_VPX_INCS)" == "$(SDK_VBOX_VPX_DEFAULT_INCS)") + && ("$(SDK_VBoxLibVpx_INCS)" == "$(SDK_VBoxLibVpx_DEFAULT_INCS)") include $(PATH_SUB_CURRENT)/libvpx-1.11.0/Makefile.kmk endif |