Changeset 14042 in vbox for trunk/src/VBox/Devices/Makefile.kmk

Timestamp:

Nov 10, 2008 8:25:38 PM (16 years ago)

Author:

vboxsync

Message:

Windows build fix; VBoxDD*R0/GC should not link against RuntimeR0/GC, but the VMM to avoid duplicate runtime code (some which can be really bad).

File:

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

trunk/src/VBox/Devices/Makefile.kmk

@@ -410 +410 @@
 VBoxDDGC_LDFLAGS        = -Entry:vgaMMIOWrite
 endif
-ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),)
+if1of ($(VBOX_LDR_FMT32), pe lx)
 VBoxDDGC_LIBS           = \
         $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) \
@@ -473 +473 @@
 VBoxDDR0_LDFLAGS        = -Entry:vgaMMIOWrite
 endif
-ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),)
+if1of ($(VBOX_LDR_FMT), pe lx)
 VBoxDDR0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
-endif
-VBoxDDR0_LIBS          += $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-ifeq ($(VBOX_LDR_FMT32),elf) # this is template stuff!
-VBoxDDR0_LIBS          += $(VBOX_GCC_LIBGCC)
 endif
 
@@ -495 +491 @@
 VBoxDD2GC_LDFLAGS        = -Entry:apicMMIOWrite
 endif
-ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),)
+if1of ($(VBOX_LDR_FMT32), pe lx)
 VBoxDD2GC_LIBS           = \
         $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) \
@@ -515 +511 @@
 VBoxDD2R0_LDFLAGS        = -Entry:apicMMIOWrite
 endif
-ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),)
+if1of ($(VBOX_LDR_FMT), pe lx)
 VBoxDD2R0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
-endif
-VBoxDD2R0_LIBS          += $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-ifeq ($(VBOX_LDR_FMT),elf)
-VBoxDD2R0_LIBS          += $(VBOX_GCC_LIBGCC)
 endif