Changeset 20403 in vbox

Timestamp:

Jun 8, 2009 1:31:28 PM (16 years ago)

Author:

vboxsync

Message:

ACPI: include vbox.dsl into the binary if needed

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -409 +409 @@
 DevicesR3_DEFS.l4      += _GNU_SOURCE
 
-# VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl. (bird: What's vboxaml.aml?)
+ifdef VBOX_WITH_DYNAMIC_DSDT
+DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxdsl.hex
+PC/ACPI/VBoxAcpi.cpp_DEPS     = $(PATH_DevicesR3)/vboxdsl.hex
+
+$$(PATH_DevicesR3)/vboxdsl.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
+        $(call MSG_TOOL,bin2c,DevicesR3,$<,$@)
+        $(QUIET)$(VBOX_BIN2C) -export VboxDslSource $< $@
+
+vboxdsl.hex:: $$(PATH_DevicesR3)/vboxdsl.hex
+
+else
+# VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl
 DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxaml.hex $(PATH_DevicesR3)/vboxaml.aml
 PC/ACPI/VBoxAcpi.cpp_DEPS     = $(PATH_DevicesR3)/vboxaml.hex
-PC/ACPI/VBoxAcpi.cpp_INCS     = $(PATH_DevicesR3)
 
 $$(PATH_DevicesR3)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
@@ -420 +430 @@
 vboxaml.hex:: $$(PATH_DevicesR3)/vboxaml.hex
 
+endif
+PC/ACPI/VBoxAcpi.cpp_INCS     = $(PATH_DevicesR3)
 
 # For finding PCIInternal.h from VBox/pci.h.