Changeset 48179 in vbox for trunk/src

Timestamp:

Aug 30, 2013 4:59:15 AM (11 years ago)

Author:

vboxsync

Message:

Conditionally include lwip makefile to make it possible to build
locally. This is still icky.

Location:

trunk/src/VBox

Files:

trunk/src/VBox/Devices/Makefile.kmk

-              r48178
+              r48179
     VBoxDD_SOURCES      += $(LWIP_SOURCES)
   else
     # XXX: Ancestor makefile includes us before NAT service, so NAT
     #      makefile depends on lwip Makefile included here...
     include $(PATH_SUB_CURRENT)/Network/lwip-new/Makefile.kmk
+    # XXX: do not depend on order
+    ifndef LWIP_SOURCES
+      include $(PATH_SUB_CURRENT)/Network/lwip-new/Makefile.kmk
+    endif
     Network/DevINIP.cpp_DEFS += VBOX_WITH_NEW_LWIP
     $(eval $(call def_vbox_lwip_private, \

-              r48178
+              r48179
 ifdef VBOX_WITH_LWIP_NAT
+# XXX: This file depends on lwip makefile already included by Devices,
+#      which is included by ancestor makefile before us...
+#if !defined(LWIP_SOURCES) # ???
+#  include ../../Devices/Network/lwip-new/Makefile.kmk
+#endif
+# XXX: do not depend on order
+ifndef LWIP_SOURCES
+  include ../../Devices/Network/lwip-new/Makefile.kmk
+endif
 ifdef VBOX_WITH_HARDENING

Note: See TracChangeset for help on using the changeset viewer.