儲存庫 vbox 的更動 50058

時間撮記:

2014-1-13 上午03:58:29 (11 年 以前)

作者:

vboxsync

訊息:

def_vbox_lwip_flags: Make it possible to supply additional compilation
flags to lwip from the client component by adding FOO_LWIP_INCS to
corresponding _INCS, ditto for _DEFS. This is intended for components
that use def_vbox_lwip_private and then call def_vbox_lwip_flags on a
few of its files that use lwip.

Adjust affected callers.

Not used by any component yet, but it makes it possible to supply
different lwipopt.h to different builds of lwip (coming soon in a
separate commit).

位置:

trunk/src/VBox/Devices

檔案:

• Makefile.kmk (修改) (2 筆差異)
• Network/lwip-new/Makefile.kmk (修改) (4 筆差異)

trunk/src/VBox/Devices/Makefile.kmk

@@ -375 +375 @@
                       VBoxDD, Network/lwip-new))
     $(eval $(call def_vbox_lwip_flags, \
-                      Network/DevINIP.cpp, Network/lwip-new))
+                      VBoxDD, Network/DevINIP.cpp, Network/lwip-new))
   endif
  endif # VBOX_WITH_INIP
@@ -450 +450 @@
     Storage/DrvVD.cpp_DEFS += VBOX_WITH_NEW_LWIP
     $(eval $(call def_vbox_lwip_flags, \
-                      Storage/DrvVD.cpp, Network/lwip-new))
+                      VBoxDD, Storage/DrvVD.cpp, Network/lwip-new))
   else
     Storage/DrvVD.cpp_INCS = $(LWIP_INCS)

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

@@ -95 +95 @@
 
 
+
 define _def_vbox_lwip_use # VAR_BaseName, path/to/lwip/dir
   $(strip $1)_SOURCES += \
@@ -103 +104 @@
 endef
 
-define def_vbox_lwip_flags # VAR_BaseName, path/to/lwip/dir
-  $(strip $1)_INCS += $(foreach incdir, $(LWIP_INCS), $(strip $2)/$(incdir))
+
+define def_vbox_lwip_flags # PROTO_BaseName, VAR_BaseName, path/to/lwip/dir
+  # add anything configured for the component via PROTO_BaseName
+  $(foreach suffix, INCS DEFS,
+    $(if $(value $(strip $1)_LWIP_$(suffix)),
+      $(eval #
+        $(strip $2)_$(suffix) += $(value $(strip $1)_LWIP_$(suffix))
+      )))
+
+  # add lwip's own includes
+  $(strip $2)_INCS += $(foreach incdir, $(LWIP_INCS), $(strip $3)/$(incdir))
 endef
+
 
 ###
@@ -117 +128 @@
 define def_vbox_lwip_public # VAR_BaseName, path/to/lwip/dir
   $(eval $(call _def_vbox_lwip_use, $1, $2))
-  $(eval $(call def_vbox_lwip_flags, $1, $2))
+  $(eval $(call def_vbox_lwip_flags, $1, $1, $2))
 endef
+
 
 ###
@@ -131 +143 @@
   $(eval $(call _def_vbox_lwip_use, $1, $2))
   $(foreach file, $(LWIP_SOURCES), \
-    $(eval $(call def_vbox_lwip_flags, $(strip $2)/$(file), $2)))
+    $(eval $(call def_vbox_lwip_flags, $1, $(strip $2)/$(file), $2)))
 endef