Changeset 53826 in vbox for trunk

Timestamp:

Jan 15, 2015 3:01:22 PM (10 years ago)

Author:

vboxsync

Message:

added another two Windows resource files

Location:

trunk/src/VBox/NetworkServices

Files:

• DHCP/Makefile.kmk (modified) (2 diffs)
• DHCP/VBoxNetDHCP.rc (added)
• NAT/Makefile.kmk (modified) (3 diffs)
• NAT/VBoxNetNAT.rc (added)

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

@@ -18 +18 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
+
+VBOX_PATH_NET_DHCP_SRC := $(PATH_SUB_CURRENT)
 
 #
@@ -48 +50 @@
         Config.cpp \
         NetworkManagerDhcp.cpp \
-        ../NetLib/VBoxNetIntIf.cpp \
-        ../NetLib/VBoxNetUDP.cpp \
-        ../NetLib/VBoxNetARP.cpp \
-        ../NetLib/VBoxNetBaseService.cpp \
-        ../NetLib/ComHostUtils.cpp
+        $(VBOX_PATH_NET_DHCP_SRC)/../NetLib/VBoxNetIntIf.cpp \
+        $(VBOX_PATH_NET_DHCP_SRC)/../NetLib/VBoxNetUDP.cpp \
+        $(VBOX_PATH_NET_DHCP_SRC)/../NetLib/VBoxNetARP.cpp \
+        $(VBOX_PATH_NET_DHCP_SRC)/../NetLib/VBoxNetBaseService.cpp \
+        $(VBOX_PATH_NET_DHCP_SRC)/../NetLib/ComHostUtils.cpp
 VBoxNetDHCP_LIBS = \
         $(LIB_RUNTIME)
 VBoxNetDHCP_LDFLAGS.win = /SUBSYSTEM:windows
 
+ifeq ($(KBUILD_TARGET),win)
 # Icon include file.
-VBoxNetDHCP_SOURCES.win += $(VBoxNetDHCP_0_OUTDIR)/VBoxNetDHCP-icon.rc
-VBoxNetDHCP_CLEAN.win   += $(VBoxNetDHCP_0_OUTDIR)/VBoxNetDHCP-icon.rc
+VBoxNetDHCP_SOURCES     += VBoxNetDHCP.rc
+VBoxNetDHCP.rc_INCS      = $(VBoxNetDHCP_0_OUTDIR)
+VBoxNetDHCP.rc_DEPS      = $(VBoxNetDHCP_0_OUTDIR)/VBoxNetDHCP-icon.rc
+VBoxNetDHCP.rc_CLEAN     = $(VBoxNetDHCP_0_OUTDIR)/VBoxNetDHCP-icon.rc
 $$(VBoxNetDHCP_0_OUTDIR)/VBoxNetDHCP-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxNetDHCP_DEFPATH)/Makefile.kmk | $$(dir $$@)
         $(RM) -f $@
         $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
-
-
+endif # win
 
 include $(FILE_KBUILD_SUB_FOOTER)

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

@@ -18 +18 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+VBOX_PATH_NAT_SRC := $(PATH_SUB_CURRENT)
+
 ifdef VBOX_WITH_LWIP_NAT
 # XXX: do not depend on order
 ifndef LWIP_SOURCES
-  include ../../Devices/Network/lwip-new/Makefile.kmk
+  include $(PATH_SUB_CURRENT)/../../Devices/Network/lwip-new/Makefile.kmk
 endif
 
@@ -47 +49 @@
 VBoxNetLwipNAT_DEFS.win += VBOX_COM_OUTOFPROC_MODULE _WIN32_WINNT=0x501 # Windows XP
 VBoxNetLwipNAT_SOURCES += VBoxNetLwipNAT.cpp    \
-        ../NetLib/VBoxNetBaseService.cpp \
-        ../NetLib/VBoxNetPortForwardString.cpp \
-        ../NetLib/VBoxNetIntIf.cpp \
-        ../NetLib/VBoxNetUDP.cpp \
-        ../NetLib/VBoxNetARP.cpp \
-        ../NetLib/ComHostUtils.cpp
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetBaseService.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetPortForwardString.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetIntIf.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetUDP.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetARP.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/ComHostUtils.cpp
 
 VBoxNetLwipNAT_LIBS = \
@@ -128 +130 @@
 VBoxNetLwipNAT_INCS += . # for lwipopts.h
 $(eval $(call def_vbox_lwip_public, \
-    VBoxNetLwipNAT, ../../Devices/Network/lwip-new))
+    VBoxNetLwipNAT, $(PATH_SUB_CURRENT)/../../Devices/Network/lwip-new))
 endif
 
+ifeq ($(KBUILD_TARGET),win)
 # Icon include file.
-VBoxNetLwipNAT_SOURCES.win += $(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetLwipNAT-icon.rc
-VBoxNetLwipNAT_CLEAN.win   += $(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetLwipNAT-icon.rc
+VBoxNetLwipNAT_SOURCES  += VBoxNetNAT.rc
+VBoxNetNAT.rc_INCS       = $(VBoxNetLwipNAT_0_OUTDIR))
+VBoxNetNAT.rc_SOURCES    = $(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetLwipNAT-icon.rc
+VBoxNetNAT.rc_CLEAN      = $(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetLwipNAT-icon.rc
 $$(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetLwipNAT-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxNetLwipNAT_DEFPATH)/Makefile.kmk | $$(dir $$@)
         $(RM) -f $@
         $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
-
+endif # win
 
 include $(FILE_KBUILD_SUB_FOOTER)