Changeset 60426 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 11, 2016 1:58:10 PM (9 years ago)

Author:

vboxsync

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

106512

Message:

Devices/{Graphics/PC}/BIOS: build fixes for VBOX_WITH_OPEN_WATCOM unset

Location:

trunk/src/VBox/Devices

Files:

• Graphics/BIOS/Makefile.kmk (modified) (2 diffs)
• PC/BIOS/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

@@ -121 +121 @@
   VgaBiosBin_CLEAN  += $$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom
 
-  $$$$(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c + $$$$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom: \
+  $$$$(VgaBiosBin_0_OUTDIR)/VgaBiosBin$(1).c + $$$$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom: \
                 $$(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative$(1).asm \
                 $$(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative$(1).md5sum \
@@ -130 +130 @@
                 $$(MD5SUM_EXT) -c $$(basename $$<).md5sum
         $$(QUIET)$$(VBOX_BIN2C) -min 32 -max 36 -mask 0x0fff -ascii -export VgaBiosBinary$(1) $$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom $$@
-        $$(QUIET)$$(RM) -f -- $$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom
+        $$(QUIET)$$(RM) -f -- $$$$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom
  endif
 endef

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -151 +151 @@
         $$(QUIET)$$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary$(1) $$< $$@
  else
-  PcBiosBin_CLEAN    += $(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom
+  PcBiosBin_CLEAN    += $$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom
 
   $$$$(PcBiosBin_0_OUTDIR)/PcBiosBin$(1).c + $$$$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom: \
@@ -158 +158 @@
                 $$(VBOX_BIN2C) | $$$$(dir $$$$@)
         $$(call MSG_TOOL,bin2c,PcBiosBin,$$<,$$@)
-        $$(QUIET)yasm -f bin -o $$(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom $$<
+        $$(QUIET)yasm -f bin -o $$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom $$<
         $$(QUIET)$$(REDIRECT) -C $$(PcBiosBin_0_OUTDIR) -- \
                 $$(MD5SUM_EXT) -c $$(basename $$<).md5sum
-        $$(QUIET)$$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary$(1) $$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom $@
+        $$(QUIET)$$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary$(1) $$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom $$@
         $$(QUIET)$$(RM) -f -- $$$$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom
  endif