summaryrefslogtreecommitdiffstats
path: root/Config.kmk
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Config.kmk16
1 files changed, 8 insertions, 8 deletions
diff --git a/Config.kmk b/Config.kmk
index 38833aa2..37ec8fbf 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -2507,7 +2507,7 @@ VBOX_PATH_NSIS ?= $(KBUILD_DEVTOOLS)/win.x86/nsis/v3.08-log
# Windows install tools...
# Note! The scripts has been moved to Bin in v8.0.
-VBOX_PATH_WIX ?= $(KBUILD_DEVTOOLS)/win.x86/wix/v3.11.2
+VBOX_PATH_WIX ?= $(KBUILD_DEVTOOLS)/win.x86/wix/v3.14.1
ifdef VBOX_WITH_NEW_WINDOWS_SDK
VBOX_PATH_MSITRAN ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/../x86/MsiTran.Exe
VBOX_PATH_MSIDB ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/../x86/MsiDb.Exe
@@ -4899,12 +4899,12 @@ endif
ifdef VBOX_WITH_LIBCURL
SDK_VBoxLibCurl := libcurl for dll linking.
- SDK_VBoxLibCurl_INCS ?= $(PATH_ROOT)/src/libs/curl-8.4.0/include
+ SDK_VBoxLibCurl_INCS ?= $(PATH_ROOT)/src/libs/curl-8.7.1/include
SDK_VBoxLibCurl_LIBS ?= $(PATH_STAGE_LIB)/VBox-libcurl$(VBOX_SUFF_LIB)
SDK_VBoxLibCurl_DEFS ?= BUILDING_LIBCURL
SDK_VBoxLibCurl-x86 = libcurl/x86 for dll linking.
- SDK_VBoxLibCurl-x86_INCS ?= $(PATH_ROOT)/src/libs/curl-8.4.0/include
+ SDK_VBoxLibCurl-x86_INCS ?= $(PATH_ROOT)/src/libs/curl-8.7.1/include
SDK_VBoxLibCurl-x86_LIBS.x86 ?= $(PATH_STAGE_LIB)/VBox-libcurl-x86$(VBOX_SUFF_LIB)
SDK_VBoxLibCurl-x86_DEFS ?= BUILDING_LIBCURL
endif
@@ -4930,7 +4930,7 @@ endif
# openssl
SDK_VBoxOpenSslStatic := OpenSSL - Only for VBoxRT and/or statically linked programs.
-SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-3.1.4-headers/include
+SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-3.1.5-headers/include
SDK_VBoxOpenSslStatic_INCS ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)
SDK_VBoxOpenSslStatic_ORDERDEPS ?= $(crypto-headers_1_TARGET)
if !defined(VBOX_ONLY_SDK) \
@@ -4944,7 +4944,7 @@ SDK_VBoxOpenSslStatic_LIBS ?= \
$(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB)
SDK_VBoxOpenSslStatic-x86 := OpenSSL/x86 - Only for VBoxRT and/or statically linked programs.
-SDK_VBoxOpenSslStatic-x86_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-3.1.4-headers/include
+SDK_VBoxOpenSslStatic-x86_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-3.1.5-headers/include
SDK_VBoxOpenSslStatic-x86_INCS ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)
SDK_VBoxOpenSslStatic-x86_ORDERDEPS ?= $(crypto-headers_1_TARGET)
if ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)")
@@ -5027,7 +5027,7 @@ SDK_VBoxSoftFloatGuestR3Shared_LIBS.$(KBUILD_TARGET_ARCH) = \
ifdef VBOX_WITH_LIBSSH
SDK_VBoxLibSsh := libssh for dynamic dll loading with assembly stubs.
- SDK_VBoxLibSsh_INCS ?= $(PATH_ROOT)/src/libs/libssh-0.10.5/include
+ SDK_VBoxLibSsh_INCS ?= $(PATH_ROOT)/src/libs/libssh-0.10.6/include
# SDK_VBoxLibSsh_LIBS is not defined, as VBoxLibSsh dll is not linked, but loaded explicitly
# by auto-generated stub code (lazy loading)
endif
@@ -5063,7 +5063,7 @@ endif
# libxml2
SDK_VBoxLibXml2 := libxml2 for dll linking.
-SDK_VBoxLibXml2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.9.14/include
+SDK_VBoxLibXml2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.12.6/include
SDK_VBoxLibXml2_DEFS ?= _REENTRANT LIBXML_STATIC LIBXML_STATIC_FOR_DLL
SDK_VBoxLibXml2_DEFS.win ?= WIN32 _WINDOWS _MBCS HAVE_WIN32_THREADS HAVE_COMPILER_TLS
# Note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
@@ -9006,7 +9006,7 @@ endif
SVN ?= svn$(HOSTSUFF_EXE)
VBOX_SVN_REV_KMK = $(PATH_OUT)/revision.kmk
ifndef VBOX_SVN_REV
- VBOX_SVN_REV_CONFIG_FALLBACK := $(patsubst %:,, $Rev: 161085 $ )
+ VBOX_SVN_REV_CONFIG_FALLBACK := $(patsubst %:,, $Rev: 162738 $ )
VBOX_SVN_REV_FALLBACK := $(if-expr $(VBOX_SVN_REV_CONFIG_FALLBACK) > $(VBOX_SVN_REV_VERSION_FALLBACK),$(VBOX_SVN_REV_CONFIG_FALLBACK),$(VBOX_SVN_REV_VERSION_FALLBACK))
VBOX_SVN_DEP := $(firstword $(wildcard $(PATH_ROOT)/.svn/wc.db $(abspath $(PATH_ROOT)/../.svn/wc.db) $(abspath $(PATH_ROOT)/../../.svn/wc.db) $(PATH_ROOT)/.svn/entries))
ifeq ($(which $(SVN)),)