Changeset 71324 in vbox for trunk

Timestamp:

Mar 14, 2018 2:20:19 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Cleanup/rework Makefile first of all: Defines.

File:

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

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

@@ -94 +94 @@
 
 #
-# VirtualBox - The GUI program.
+# VirtualBox - GUI Application.
 #
 USES += qt5
@@ -106 +106 @@
 VirtualBox_DEFS           =
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
-VirtualBox_DEFS.linux     = VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
-VirtualBox_DEFS.solaris   = VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
-VirtualBox_DEFS.freebsd   = VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
-VirtualBox_DEFS.darwin    = VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS
-VirtualBox_DEFS.win       = VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS
+VirtualBox_DEFS.linux     = VBOX_WS_X11
+VirtualBox_DEFS.solaris   = VBOX_WS_X11
+VirtualBox_DEFS.freebsd   = VBOX_WS_X11
+VirtualBox_DEFS.darwin    = VBOX_WS_MAC
+VirtualBox_DEFS.win       = VBOX_WS_WIN
+VirtualBox_DEFS.linux     += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
+VirtualBox_DEFS.solaris   += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
+VirtualBox_DEFS.freebsd   += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
+VirtualBox_DEFS.darwin    += VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS
+VirtualBox_DEFS.win       += VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS
+VirtualBox_DEFS.darwin    += VBOX_DARWIN_USE_NATIVE_CONTROLS
 VirtualBox_DEFS.win       += UNICODE QT_DLL
-ifdef VBOX_WITH_ICHAT_THEATER
- VirtualBox_DEFS.darwin   += VBOX_WITH_ICHAT_THEATER
-endif
-VirtualBox_DEFS.linux     += VBOX_WS_X11
-VirtualBox_DEFS.solaris   += VBOX_WS_X11
-VirtualBox_DEFS.freebsd   += VBOX_WS_X11
-VirtualBox_DEFS.darwin    += VBOX_WS_MAC
-VirtualBox_DEFS.win       += VBOX_WS_WIN
 VirtualBox_DEFS           += \
         $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
@@ -146 +144 @@
         $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
 ifdef VBOX_WITH_DEBUGGER_GUI
- VirtualBox_DEFS        += VBOX_WITH_DEBUGGER_GUI
+ VirtualBox_DEFS          += VBOX_WITH_DEBUGGER_GUI
  if "$(KBUILD_TYPE)" != "release"
-  VirtualBox_DEFS       += VBOX_WITH_DEBUGGER_GUI_MENU
+  VirtualBox_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
  endif
 endif
 ifdef VBOX_WITH_VIDEOHWACCEL
- VirtualBox_DEFS        += VBOX_WITH_VIDEOHWACCEL \
-        VBOX_GUI_USE_QGL
+ VirtualBox_DEFS          += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
 else ifdef VBOX_GUI_USE_QGL
- VirtualBox_DEFS        += VBOX_GUI_USE_QGL
+ VirtualBox_DEFS          += VBOX_GUI_USE_QGL
 endif
 ifdef VBOX_WITH_LIBCURL
- VirtualBox_DEFS        += VBOX_GUI_WITH_NETWORK_MANAGER
+ VirtualBox_DEFS          += VBOX_GUI_WITH_NETWORK_MANAGER
  VBOX_GUI_WITH_NETWORK_MANAGER := 1
 endif
 ifneq ($(KBUILD_TYPE),release)
- VirtualBox_DEFS        += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
+ VirtualBox_DEFS          += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
+endif
+ifdef VBOX_WITH_ICHAT_THEATER
+ VirtualBox_DEFS.darwin   += VBOX_WITH_ICHAT_THEATER
 endif
 
@@ -911 +911 @@
 endif
 
-VirtualBox_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS
 VirtualBox_SOURCES.darwin += \
         src/platform/darwin/CocoaEventHelper.mm \