Changeset 14282 in vbox for trunk/src/VBox

Timestamp:

Nov 18, 2008 10:29:48 AM (16 years ago)

Author:

vboxsync

Message:

fixed Drivers_DEFS

File:

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

trunk/src/VBox/Devices/Makefile.kmk

@@ -527 +527 @@
 Drivers_DEFS       = IN_IDE_R3
 ifdef VBOX_WITH_NETFLT
-Drivers_DEFS       = VBOX_WITH_NETFLT
-endif
-ifdef VBOX_WITH_SYNC_SLIRP
-Drivers_DEFS       = VBOX_WITH_SYNC_SLIRP
-endif
-ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
-Drivers_DEFS       = VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
+Drivers_DEFS      += VBOX_WITH_NETFLT
 endif
 ifdef VBOX_WITH_BSD_REASS
-Drivers_DEFS       = VBOX_WITH_BSD_REASS
+Drivers_DEFS      += VBOX_WITH_BSD_REASS
 endif
 ifdef VBOX_WITH_BSD_TCP_REASS
-Drivers_DEFS       = VBOX_WITH_BSD_TCP_REASS
+Drivers_DEFS      += VBOX_WITH_BSD_TCP_REASS
 endif
 Drivers_INCS      := \
@@ -588 +582 @@
 Drivers_SOURCES += $(VBOX_SLIRP_SOURCES)
  define def_vbox_slirp_cflags
+  ifeq ($(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC),1)
+   $(file)_DEFS = VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
+  endif
   ifeq ($(KBUILD_TARGET),win)
    $(file)_CFLAGS = -wd4018
@@ -596 +593 @@
   $(foreach file,$(VBOX_SLIRP_SOURCES),$(eval $(def_vbox_slirp_cflags)))
 else
+
 NatAlias_TEMPLATE   = VBOXR3NP
-
-
-Drivers_SOURCES +=      Network/DrvNAT.cpp
-
+Drivers_SOURCES += Network/DrvNAT.cpp
 Network/DrvNAT.cpp_DEFS += VBOX_NAT_SOURCES
 Network/nat/src/sys/net/if_clone.c_CFLAGS.linux += -std=c99