Changeset 75089 in vbox

Timestamp:

Oct 26, 2018 11:27:19 AM (6 years ago)

Author:

vboxsync

Message:

FEQt/Makefile.kmk: Made VBOX_GUI_WITH_EXTRADATA_MANAGER_UI and VBOX_GUI_WITH_GUEST_CONTROL_UI configurable from LocalConfig.kmk; added missing else/endif comments for VBOX_GUI_WITH_SHARED_LIBRARY.

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (23 diffs)

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

@@ -80 +80 @@
  endif
 
-else
+else # !VBOX_GUI_WITH_SHARED_LIBRARY
 
  #
@@ -94 +94 @@
  src/platform/win/VirtualBoxHardened.rc_DEPS  = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
 
-endif
+endif # !VBOX_GUI_WITH_SHARED_LIBRARY
 
 
@@ -195 +195 @@
  VBOX_GUI_WITH_NETWORK_MANAGER := 1
 endif
-ifneq ($(KBUILD_TYPE),release)
+if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
  VirtualBox_DEFS          += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 endif
@@ -204 +204 @@
 
 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+
  #
  # VirtualBox Virtual Machine Application
@@ -266 +267 @@
   VBOX_GUI_WITH_NETWORK_MANAGER := 1
  endif
- ifneq ($(KBUILD_TYPE),release)
+ if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
   VirtualBoxVM_DEFS          += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
  endif
@@ -322 +323 @@
   VBOX_GUI_WITH_NETWORK_MANAGER := 1
  endif
- ifneq ($(KBUILD_TYPE),release)
+ if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
   VBoxGlobal_DEFS        += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
+ endif
+ if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_GUEST_CONTROL_UI)
   VBoxGlobal_DEFS        += VBOX_GUI_WITH_GUEST_CONTROL_UI
  endif
@@ -329 +332 @@
   VBoxGlobal_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
  endif
-endif
+
+endif # VBOX_GUI_WITH_SHARED_LIBRARY
 
 
@@ -394 +398 @@
 
 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+
  #
  # VirtualBox Virtual Machine Application
@@ -410 +415 @@
         $(VBOX_GUI_INC_DIRS) \
         $(VBoxGlobal_0_OUTDIR)/include
-endif
+
+endif # VBOX_GUI_WITH_SHARED_LIBRARY
 
 
@@ -455 +461 @@
 
 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+
  #
  # VirtualBox Virtual Machine Application
@@ -516 +523 @@
   VBoxGlobal_LDFLAGS.darwin += -framework OpenGL
  endif
-endif
+
+endif # VBOX_GUI_WITH_SHARED_LIBRARY
 
 
@@ -575 +583 @@
 
 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+
  #
  # VirtualBox Virtual Machine Application
@@ -664 +673 @@
   endif
  endif
-endif
+
+endif # VBOX_GUI_WITH_SHARED_LIBRARY
 
 
@@ -964 +974 @@
 
 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+
  #
  # VirtualBox Virtual Machine Application
@@ -1180 +1191 @@
         src/platform/darwin/UICocoaSpecialControls.h \
         src/platform/darwin/UIWindowMenuManager.h
-endif
+
+endif # VBOX_GUI_WITH_SHARED_LIBRARY
 
 
@@ -1255 +1267 @@
  VirtualBox_QT_MOCSRCS.freebsd += \
         src/globals/UIDesktopWidgetWatchdog.cpp
-endif
-
+endif # VBOX_GUI_WITH_SHARED_LIBRARY
 
 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+
  #
  # VirtualBox Virtual Machine Application
@@ -1327 +1339 @@
  VBoxGlobal_QT_MOCSRCS.freebsd += \
         src/globals/UIDesktopWidgetWatchdog.cpp
-endif
+
+endif # VBOX_GUI_WITH_SHARED_LIBRARY
 
 
@@ -1684 +1697 @@
         src/platform/darwin/VBoxUtils-darwin-cocoa.mm \
         src/platform/darwin/VBoxUtils-darwin.cpp
-endif
-
-
+
+endif # !VBOX_GUI_WITH_SHARED_LIBRARY
 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+
  #
  # VirtualBox Virtual Machine Application
@@ -1962 +1975 @@
         src/VBoxGLSupportInfo.cpp
  endif
-endif
+
+endif # VBOX_GUI_WITH_SHARED_LIBRARY
 
 
@@ -2000 +2014 @@
 
 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+
  #
  # VirtualBox Virtual Machine Application
@@ -2030 +2045 @@
   VBoxGlobal_QT_MODULES += OpenGL
  endif
-endif
+
+endif # VBOX_GUI_WITH_SHARED_LIBRARY
 
 
@@ -2148 +2164 @@
  testwrappers:: $$(VirtualBox_0_OUTDIR)/include/COMWrappers
 
-else
+else # VBOX_GUI_WITH_SHARED_LIBRARY
 
  #
@@ -2182 +2198 @@
  testwrappers:: $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers
 
-endif
+endif # VBOX_GUI_WITH_SHARED_LIBRARY