Changeset 93424 in vbox for trunk/src

Timestamp:

Jan 24, 2022 9:09:41 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

149529

Message:

*.kmk: Try contain VBOX_WITH_VMNET to darwin in the makefile usage. bugref:9932

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (1 diff)
• Frontends/VBoxManage/Makefile.kmk (modified) (1 diff)
• Frontends/VirtualBox/Makefile.kmk (modified) (3 diffs)
• Main/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -555 +555 @@
 
  ifdef VBOX_WITH_VMNET
-  VBoxDD_DEFS           += VBOX_WITH_VMNET
-  VBoxDD_SOURCES        += \
+  VBoxDD_DEFS.darwin    += VBOX_WITH_VMNET
+  VBoxDD_SOURCES.darwin += \
         Network/DrvVMNet.m
-  VBoxDD_LDFLAGS += -framework vmnet
+  VBoxDD_LDFLAGS.darwin += -framework vmnet
  endif
 

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -32 +32 @@
         $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
         $(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
-        $(if $(VBOX_WITH_VMNET), VBOX_WITH_VMNET) \
+        $(if-expr defined(VBOX_WITH_VMNET) && "$(KBUILD_TARGET)"=="darwin",VBOX_WITH_VMNET,) \
         $(if $(VBOX_WITH_CLOUD_NET), VBOX_WITH_CLOUD_NET) \
         $(if $(VBOX_WITH_LIBCURL), VBOX_WITH_PROXY_INFO) \

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -165 +165 @@
 VirtualBoxVM_DEFS.darwin    += VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS
 VirtualBoxVM_DEFS.win       += VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS
-VirtualBoxVM_DEFS.darwin    += VBOX_DARWIN_USE_NATIVE_CONTROLS
+VirtualBoxVM_DEFS.darwin    += \
+        VBOX_DARWIN_USE_NATIVE_CONTROLS \
+        $(if $(VBOX_WITH_VMNET),VBOX_WITH_VMNET)
 VirtualBoxVM_DEFS.win       += UNICODE QT_DLL
 VirtualBoxVM_DEFS           += \
@@ -171 +173 @@
         $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
         $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \
-        $(if $(VBOX_WITH_VMNET),VBOX_WITH_VMNET) \
         $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \
         $(if $(VBOX_WITH_HARDENING),VBOXR3_HARDENED_DLL) \
@@ -217 +218 @@
 UICommon_DEFS.win     = VBOX_WS_WIN
 UICommon_DEFS.debug   = VBOX_CHECK_STATE # QT_FATAL_ASSERT
-UICommon_DEFS.darwin  += VBOX_DARWIN_USE_NATIVE_CONTROLS
+UICommon_DEFS.darwin  += \
+        VBOX_DARWIN_USE_NATIVE_CONTROLS \
+        $(if $(VBOX_WITH_VMNET),VBOX_WITH_VMNET)
 #UICommon_DEFS.win     += UNICODE QT_DLL
 UICommon_DEFS         += \
         $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
         $(if $(VBOX_WITH_CLOUD_NET),VBOX_WITH_CLOUD_NET) \
-        $(if $(VBOX_WITH_VMNET),VBOX_WITH_VMNET) \
         $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \
         $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \

trunk/src/VBox/Main/Makefile.kmk

@@ -126 +126 @@
 VBOX_MAIN_DEFS += VBOX_WITH_NETFLT
 endif
-ifdef VBOX_WITH_VMNET
+if defined(VBOX_WITH_VMNET) && "$(KBUILD_TARGET)" == "darwin"
 VBOX_MAIN_DEFS += VBOX_WITH_VMNET
 endif
@@ -622 +622 @@
         src-server/NetworkServiceRunner.cpp \
         src-server/NATNetworkImpl.cpp \
-        $(if $(VBOX_WITH_VMNET), \
-        src-server/HostOnlyNetworkImpl.cpp \
-        ,) \
         $(if $(VBOX_WITH_CLOUD_NET), \
         src-server/CloudNetworkImpl.cpp \
@@ -693 +690 @@
         src-server/darwin/HostPowerDarwin.cpp \
         src-server/darwin/HostDnsServiceDarwin.cpp
+ifdef VBOX_WITH_VMNET
+ VBoxSVC_SOURCES.darwin += \
+        src-server/HostOnlyNetworkImpl.cpp
+endif
 
 VBoxSVC_SOURCES.win = \