Changeset 10153 in vbox

Timestamp:

Jul 3, 2008 1:14:02 PM (16 years ago)

Author:

vboxsync

Message:

Filespec for common files for the Windows Guest Additions.

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.
+ifdef VBOX_WITH_ADDITIONS_ISO
+ 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
@@ -173 +179 @@
         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.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions.exe \
-        AUTORUN.INF=./WINNT/Installer/AUTORUN.INF
+        VBoxWindowsAdditions-x86.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions-x86.exe
  ifdef VBOX_WITH_WIN32_ADDITIONS_SHAREDFOLDERS
   GUESTADDITIONS_FILESPEC.win.x86 += \
@@ -191 +195 @@
                 $(filter-out %=deleteme=,\
                         $(subst =,=deleteme= ,\
+                                $(GUESTADDITIONS_FILESPEC.win) \
                                 $(GUESTADDITIONS_FILESPEC.win.x86) \
                                 $(GUESTADDITIONS_FILESPEC.win.amd64) \
@@ -210 +215 @@
         $(VBOX_MKISOFS) -rational-rock -joliet -iso-level 3 \
                 -volid "VBOXADDITIONS_$(VBOX_VERSION_STRING)_$(VBOX_SVN_REV)" -l -graft-points -o $@ \
+                $(GUESTADDITIONS_FILESPEC.win) \
                 $(GUESTADDITIONS_FILESPEC.win.x86) \
                 $(GUESTADDITIONS_FILESPEC.win.amd64) \