Changeset 48108 in vbox for trunk/src/VBox

Timestamp:

Aug 28, 2013 12:06:44 AM (11 years ago)

Author:

vboxsync

Message:

VBoxLwipCore.cpp is a generic wrapper for lwip, so it should live
alongside lwip. This removes Devices/Network from the list of
mandatory include directories (this will be necessary for component
specific lwipopts.h).

Location:

trunk/src/VBox

Files:

• Devices/Network/lwip-new/Makefile.kmk (modified) (2 diffs)
• Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp (moved) (moved from trunk/src/VBox/Devices/Network/VBoxLwipCore.cpp )
• Devices/Network/lwip-new/vbox/VBoxLwipCore.h (moved) (moved from trunk/src/VBox/Devices/Network/VBoxLwipCore.h )
• NetworkServices/NAT/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Network/lwip-new/Makefile.kmk

@@ -26 +26 @@
     Network/lwip-new/src/include/ipv4 \
     Network/lwip-new/src/include/ipv6 \
+    Network/lwip-new/vbox \
     Network/lwip-new/vbox/include
 
@@ -91 +92 @@
     Network/lwip-new/src/netif/slipif.c \
     Network/lwip-new/vbox/sys_arch.c \
-    Network/VBoxLwipCore.cpp
+    Network/lwip-new/vbox/VBoxLwipCore.cpp
 
 ifeq ($(USERNAME), vvl)

trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

@@ -45 +45 @@
 VBoxNetLwipNAT_TEMPLATE := VBOXMAIN$(if-expr defined(VBOX_WITH_HARDENING),DLL,CLIENTEXE)
 VBoxNetLwipNAT_NAME = VBoxNetNAT
-VBoxNetLwipNAT_INCS += ../../Devices/Network \
-        ../../Devices/Network/lwip-new/vbox # testproxy.h
+VBoxNetLwipNAT_INCS += ../../Devices/Network
 VBoxNetLwipNAT_DEFS += ${LWIP_DEFS}
 VBoxNetLwipNAT_DEFS.win += _WIN32_WINNT=0x501 # Windows XP