Changeset 98945 in vbox

Timestamp:

Mar 13, 2023 9:20:06 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156294

Message:

/Config.kmk,Add/Nt/Installer: Drop the dependency on the 32-bit build for the NSIS install helper plugin. Modifies VBoxGuestR3Dll & VBoxGuestR3DllNonPedantic to work when explicitly targetting x86. bugref:10348

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/Installer/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (1 diff)

trunk/Config.kmk

@@ -8463 +8463 @@
  TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS  = $(TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS) -fPIC
 endif
-TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS      = \
-        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
-        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
-        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS)
+ifeq ($(KBUILD_TARGET),win)
+ TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.x86 = \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
+        $(VBOX_LIB_VBGL_R3_SHARED_X86) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
+        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS.x86)
+ TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.$(KBUILD_TARGET_ARCH) = \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
+        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS.$(KBUILD_TARGET_ARCH))
+else
+ TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.$(KBUILD_TARGET_ARCH) = \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
+        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS)
+endif
 
 #

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk

@@ -37 +37 @@
 # Note! Installation is required for repacking Guest Additions
 #
-## @todo kBuild: This needs the WINPSDK fix to work for cross building.
-DLLS.x86 += VBoxGuestInstallHelper
+DLLS += VBoxGuestInstallHelper
 VBoxGuestInstallHelper_TEMPLATE        := VBoxGuestR3Dll
-VBoxGuestInstallHelper_INST             := repackadd/resources/VBoxGuestInstallHelper/
+VBoxGuestInstallHelper_BLD_TRG_ARCH    := x86
+VBoxGuestInstallHelper_INST            := repackadd/resources/VBoxGuestInstallHelper/
 ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
  VBoxGuestInstallHelper_INSTTYPE       := stage
  VBoxGuestInstallHelper_DEBUG_INSTTYPE := both
 endif
-VBoxGuestInstallHelper_DEFS             := _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
-VBoxGuestInstallHelper_BLD_TRG_ARCH    := x86
+VBoxGuestInstallHelper_DEFS            := _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
 VBoxGuestInstallHelper_SOURCES         := \
         VBoxGuestInstallHelper.cpp \

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -40 +40 @@
 #
 VBOX_PATH_WIN_ADD_INS_SRC := $(PATH_SUB_CURRENT)
-VBOX_PATH_ADDITIONS.win.x86 := $(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/bin/additions
 VBOX_WITH_GUEST_INSTALL_HELPER := 1 # Use our guest install helper DLL.
 ## @todo VBOX_WIN_ADD_INS_OUT_DIR := $(PATH_TARGET)/Additions/Installer/win
@@ -264 +263 @@
         -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \
         -E 'PATH_TARGET=$(subst /,\,$(PATH_TARGET))' \
-        -E 'PATH_TARGET_X86=$(subst /,\,$(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/obj)' \
-        -E 'VBOX_PATH_ADDITIONS_WIN_X86=$(subst /,\,$(VBOX_PATH_ADDITIONS.win.x86))' \
         -E 'VBOX_PATH_DIFX=$(subst /,\,$(VBOX_PATH_DIFX))' \
         -E 'VBOX_VENDOR=$(VBOX_VENDOR)' \

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -76 +76 @@
 !define ORG_MOUSE_PATH "MousePath"
 
-; If we have our guest install helper DLL, add the
-; plugin path so that NSIS can find it when compiling the installer
-; Note: NSIS plugins *always* have to be compiled in 32-bit!
+; If we have our guest install helper DLL, add the plugin path so that NSIS can
+; find it when compiling the installer
 !if $%VBOX_WITH_GUEST_INSTALL_HELPER% == "1"
-  !addplugindir "$%PATH_TARGET_X86%\VBoxGuestInstallHelper"
+  !addplugindir "$%PATH_TARGET%\VBoxGuestInstallHelper"
 !endif