Changeset 10243 in vbox

Timestamp:

Jul 4, 2008 5:14:02 PM (16 years ago)

Author:

vboxsync

Message:

disable $(PATH_LIB)/VBoxDD?.lib workaround when doing the single makefile thing (will be fixed properly in kBuild soon).

File:

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

trunk/src/VBox/Devices/Makefile.kmk

@@ -194 +194 @@
 
 
+ifndef VBOX_SINGLE_MAKEFILE
 # damn, fix this.
 ifeq ($(KBUILD_TARGET),win)
 $(PATH_LIB)/VBoxDD2.lib: $(PATH_BIN)/VBoxDD2.dll
 $(PATH_LIB)/VBoxDDU.lib: $(PATH_BIN)/VBoxDDU.dll
+endif
 endif
 
@@ -535 +537 @@
         Storage/DrvVD.cpp \
         Storage/VBoxHDD.cpp \
-        Network/DrvNetSniffer.cpp 
+        Network/DrvNetSniffer.cpp
 ifndef VBOX_USE_NAT
 Drivers_SOURCES += \
@@ -556 +558 @@
         Network/slirp/tcp_timer.c \
         Network/slirp/tftp.c \
-        Network/slirp/udp.c 
+        Network/slirp/udp.c
 else
 NatAlias_TEMPLATE   = VBOXR3NP
 
 
-Drivers_SOURCES +=      Network/DrvNAT2.cpp 
+Drivers_SOURCES +=      Network/DrvNAT2.cpp
 
 NatAlias_CFLAGS += -include Network/nat/bsd.h
@@ -569 +571 @@
 NatAlias_DEFS += IPFIREWALL_NAT
 NatAlias_DEFS += RWLOCK_NOINLINE
-NatAlias_DEFS += MUTEX_NOINLINE 
+NatAlias_DEFS += MUTEX_NOINLINE
 
 NatAlias_DEFS.linux   += _GNU_SOURCE