Changeset 10164 in vbox

Timestamp:

Jul 3, 2008 4:05:45 PM (17 years ago)

Author:

vboxsync

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

32702

Message:

VBoxWindowsAdditions.exe is only built on win.x86. Updated .cat/.inf todo for win.amd64.

File:

• trunk/src/VBox/Additions/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Additions/Makefile.kmk

@@ -145 +145 @@
 endif
 
-# Common Windows files used by 32- and 64-bit architectures.
-if1of ($(KBUILD_TARGET), win)
- GUESTADDITIONS_FILESPEC.win = \
-        VBoxWindowsAdditions.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions.exe \
-        AUTORUN.INF=./WINNT/Installer/AUTORUN.INF
-endif
 
 ifdef VBOX_WITH_ADDITIONS_ISO.win.amd64
- # We MUST fix the .inf / .cat problem mentioned in the todo above.
+ ## @todo Take the .inf files from the output directories, they will all be edited I think...
+ #        If that is not the case, do it in the signing ifdef below together with the .cat files.
  VBOX_PATH_ADDITIONS.win.amd64 = $(PATH_OUT_BASE)/win.amd64/$(KBUILD_TYPE)/bin/additions
  GUESTADDITIONS_FILESPEC.win.amd64 = \
@@ -174 +169 @@
         64Bit/Windows/Drivers/VBoxSF/VBoxMRXNP.dll=$(VBOX_PATH_ADDITIONS.win.amd64)/VBoxMRXNP.dll
  endif
+ ifdef VBOX_SIGNING_MODE
+  # .cat from output dirs
+ endif
 endif
 
@@ -195 +193 @@
         32Bit/Windows/3rdParty/AMD_PCnet/pcntpci5.cat=./WINNT/Network/AMD/pcntpci5.cat \
         32Bit/Windows/3rdParty/AMD_PCnet/PCNTPCI5.sys=./WINNT/Network/AMD/PCNTPCI5.sys \
-        VBoxWindowsAdditions-x86.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions-x86.exe
+        VBoxWindowsAdditions-x86.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions-x86.exe \
+        VBoxWindowsAdditions.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions.exe \
+        AUTORUN.INF=./WINNT/Installer/AUTORUN.INF
  ifdef VBOX_WITH_WIN32_ADDITIONS_SHAREDFOLDERS
   GUESTADDITIONS_FILESPEC.win.x86 += \
@@ -211 +211 @@
                 $(filter-out %=deleteme=,\
                         $(subst =,=deleteme= ,\
-                                $(GUESTADDITIONS_FILESPEC.win) \
                                 $(GUESTADDITIONS_FILESPEC.win.x86) \
                                 $(GUESTADDITIONS_FILESPEC.win.amd64) \