Changeset 40136 in vbox

Timestamp:

Feb 15, 2012 3:23:33 PM (13 years ago)

Author:

vboxsync

Message:

VBoxMRXNP, Additions installer: build and install a 32 bit version for 64 bit guests.

Location:

trunk/src/VBox/Additions/WINNT

Files:

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

-              r38082
+              r40136
         $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe \
         $(PATH_STAGE_BIN)/additions/VBoxService.exe
+ifeq ($(KBUILD_TARGET_ARCH),amd64)
+      # Also include 32-bit network provider DLLs on 64-bit guests to enable
+      # running 32-bit apps which use that.
+      DRIVER_FILES += \
+                $(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll
+endif
 ifeq ($(KBUILD_TARGET_ARCH),x86)
 DRIVER_FILES += \

-              r39558
+              r40136
   FILE "$%PATH_OUT%\bin\additions\VBoxSF.sys"
   FILE "$%PATH_OUT%\bin\additions\VBoxMRXNP.dll"
+  !if $%BUILD_TARGET_ARCH% == "amd64"
+    ; Only 64-bit installer: Also copy 32-bit DLLs on 64-bit target
+    FILE "$%PATH_OUT%\bin\additions\VBoxMRXNP-x86.dll"
+  !endif
   ; Auto-Logon

-              r39574
+              r40136
   !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMRXNP.dll" "$g_strSystemDir\VBoxMRXNP.dll" "$INSTDIR"
   AccessControl::GrantOnFile "$g_strSystemDir\VBoxMRXNP.dll" "(BU)" "GenericRead"
+  !if $%BUILD_TARGET_ARCH% == "amd64"
+    ; Only 64-bit installer: Copy the 32-bit DLL for 32 bit applications.
+    !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMRXNP-x86.dll" "$g_strSysWow64\VBoxMRXNP.dll" "$INSTDIR"
+    AccessControl::GrantOnFile "$g_strSysWow64\VBoxMRXNP.dll" "(BU)" "GenericRead"
+  !endif
   ; The VBoxTray hook DLL also goes to the system directory; it might be locked
 …
   Pop $0 ; Ret value
   Delete /REBOOTOK "$g_strSystemDir\VBoxMRXNP.dll" ; The network provider DLL will be locked
+  !if $%BUILD_TARGET_ARCH% == "amd64"
+    ; Only 64-bit installer: Also remove 32-bit DLLs on 64-bit target arch in Wow64 node
+    Delete /REBOOTOK "$g_strSysWow64\VBoxMRXNP.dll"
+  !endif ; amd64
   Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxSF.sys"

-              r31661
+              r40136
         $(VBOX_LIB_IPRT_GUEST_R3)
+#
+# VBoxMRXNP-x86 - x86 version of VBoxMRXNP built for amd64 build
+#
+DLLS.win.amd64 += VBoxMRXNP-x86
+VBoxMRXNP-x86_EXTENDS = VBoxMRXNP
+VBoxMRXNP-x86_BLD_TRG_ARCH = x86
+VBoxMRXNP-x86_LIBS = \
+        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
+        $(VBOX_LIB_VBGL_R3_X86)
+VBoxMRXNP-x86_DEFS = $(VBoxMRXNP_DEFS) VBOX_WOW64
 include $(KBUILD_PATH)/subfooter.kmk

-              r32394
+              r40136
          VALUE "InternalName",     "VBoxMRXNP.DLL\0"
          VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
+#ifdef VBOX_WOW64
+         VALUE "OriginalFilename", "VBoxMRXNP-x86.DLL\0"
+#else
          VALUE "OriginalFilename", "VBoxMRXNP.DLL\0"
+#endif
          VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
          VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"

Note: See TracChangeset for help on using the changeset viewer.