VirtualBox

Changeset 10243

Show
Ignore:
Timestamp:
07/04/08 19:14:02 (5 months ago)
Author:
vboxsync
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/VBox/Devices/Makefile.kmk

    r10200 r10243  
    194194 
    195195 
     196ifndef VBOX_SINGLE_MAKEFILE 
    196197# damn, fix this. 
    197198ifeq ($(KBUILD_TARGET),win) 
    198199$(PATH_LIB)/VBoxDD2.lib: $(PATH_BIN)/VBoxDD2.dll 
    199200$(PATH_LIB)/VBoxDDU.lib: $(PATH_BIN)/VBoxDDU.dll 
     201endif 
    200202endif 
    201203 
    …… 
    535537        Storage/DrvVD.cpp \ 
    536538        Storage/VBoxHDD.cpp \ 
    537         Network/DrvNetSniffer.cpp  
     539        Network/DrvNetSniffer.cpp 
    538540ifndef VBOX_USE_NAT 
    539541Drivers_SOURCES += \ 
    …… 
    556558        Network/slirp/tcp_timer.c \ 
    557559        Network/slirp/tftp.c \ 
    558         Network/slirp/udp.c  
     560        Network/slirp/udp.c 
    559561else 
    560562NatAlias_TEMPLATE   = VBOXR3NP 
    561563 
    562564 
    563 Drivers_SOURCES +=      Network/DrvNAT2.cpp  
     565Drivers_SOURCES +=      Network/DrvNAT2.cpp 
    564566 
    565567NatAlias_CFLAGS += -include Network/nat/bsd.h 
    …… 
    569571NatAlias_DEFS += IPFIREWALL_NAT 
    570572NatAlias_DEFS += RWLOCK_NOINLINE 
    571 NatAlias_DEFS += MUTEX_NOINLINE  
     573NatAlias_DEFS += MUTEX_NOINLINE 
    572574 
    573575NatAlias_DEFS.linux   += _GNU_SOURCE 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy