Changeset 41513 in vbox

Timestamp:

May 30, 2012 11:17:27 PM (13 years ago)

Author:

vboxsync

Message:

made the alternative work too.

Location:

trunk/src/VBox/Devices/PC/BIOS-new

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxBiosAlternative.md5sum (modified) (1 diff)

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

@@ -108 +108 @@
         $(CMP) -l -- $< $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.bin
         $(CP) --changed -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm $(PATH_ROOT)/src/VBox/Devices/PC/BIOS-new/VBoxBiosAlternative.asm
-        $(MD5SUM) -bo $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.md5sum $(VBoxPcBios_1_TARGET)
+        $(REDIRECT) -C $(dir $(VBoxPcBios_1_TARGET)) -- \
+                $(MD5SUM_EXT) -bo $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.md5sum $(notdir $(VBoxPcBios_1_TARGET))
         $(CP) --changed -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.md5sum $(PATH_ROOT)/src/VBox/Devices/PC/BIOS-new/VBoxBiosAlternative.md5sum
         $(RM) -f -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.bin $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.md5sum
@@ -133 +134 @@
         $(QUIET)$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary $< $@
 else
- $$(PcBiosBin_0_OUTDIR)/PcBiosBin.c: $(PATH_SUB_CURRENT)/VBoxBiosAlternative.asm $(VBOX_BIN2C) | $$(dir $$@)
+ PcBiosBin_CLEAN    += $(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom
+
+ $$(PcBiosBin_0_OUTDIR)/PcBiosBin.c + $$(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom: \
+                $(PATH_SUB_CURRENT)/VBoxBiosAlternative.asm \
+                $(PATH_SUB_CURRENT)/VBoxBiosAlternative.md5sum \
+                $(VBOX_BIN2C) | $$(dir $$@)
         $(call MSG_TOOL,bin2c,PcBiosBin,$<,$@)
-        $(QUIET)yasm -f bin -o $(PcBiosBin_0_OUTDIR)/VBoxBiosAlternative.bin $<
-        $(QUIET)$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary $(PcBiosBin_0_OUTDIR)/VBoxBiosAlternative.bin $@
-        $(QUIET)$(RM) -f -- $$(PcBiosBin_0_OUTDIR)/VBoxBiosAlternative.bin
+        $(QUIET)yasm -f bin -o $(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom $<
+        $(QUIET)$(REDIRECT) -C $(PcBiosBin_0_OUTDIR) -- \
+                $(MD5SUM_EXT) -c $(basename $<).md5sum
+        $(QUIET)$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary $(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom $@
+        $(QUIET)$(RM) -f -- $$(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom
 endif
 

trunk/src/VBox/Devices/PC/BIOS-new/VBoxBiosAlternative.md5sum

@@ -1 @@
-76025087e3ecf3738a573074c6955457 *E:/vbox/2vn/trunk/out/win.amd64/release/obj/VBoxPcBios/VBoxPcBios.rom
+76025087e3ecf3738a573074c6955457 *VBoxPcBios.rom