VirtualBox

Changeset 76818 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
Jan 14, 2019 4:17:07 PM (6 years ago)
Author:
vboxsync
Message:

Config.kmk, HostDrivers/Support, Main, FE/Qt, Installer: bugref:9049: Wipe out VBOX_GUI_WITH_SHARED_LIBRARY, leaving split GUI build as the only possible.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
11 edited

Legend:

Unmodified
Added
Removed

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

    r76747 r76818  
    3232#
    3333ifdef VBOX_WITH_HARDENING
    34  ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    35   PROGRAMS += VirtualBoxHardened
    36   PROGRAMS.darwin += VirtualBoxVM
    37   DLLS += VirtualBox
    38  else
    39   PROGRAMS += VirtualBox
    40   PROGRAMS += VirtualBoxHardenedVM
    41   DLLS += VirtualBoxVM
    42   DLLS += VBoxGlobal
    43  endif
     34 PROGRAMS += VirtualBox
     35 PROGRAMS += VirtualBoxHardenedVM
     36 DLLS += VirtualBoxVM
     37 DLLS += VBoxGlobal
    4438else
    4539 PROGRAMS += VirtualBox
    46  ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    47   PROGRAMS += VirtualBoxVM
    48   DLLS += VBoxGlobal
    49  endif
     40 PROGRAMS += VirtualBoxVM
     41 DLLS += VBoxGlobal
    5042endif
    5143INSTALLS += VirtualBox.nls
    … …  
    5850
    5951
    60 ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    61 
    62  #
    63  # Hardened VirtualBox.
    64  #
    65  VirtualBoxHardened_TEMPLATE = VBOXR3HARDENEDEXE
    66  VirtualBoxHardened_SOURCES = src/hardenedmain.cpp
    67  VirtualBoxHardened_SOURCES.win = src/platform/win/VirtualBoxHardened.rc
    68  VirtualBoxHardened_NAME = VirtualBox
    69  VirtualBoxHardened_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows)
    70  src/platform/win/VirtualBoxHardened.rc_INCS  = $(VirtualBox_0_OUTDIR)
    71  src/platform/win/VirtualBoxHardened.rc_DEPS  = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
    72 
    73  #
    74  # Hardened VirtualBoxVM.
    75  #
    76  ifeq ($(KBUILD_TARGET),darwin)
    77   VirtualBoxVM_EXTENDS = VirtualBoxHardened
    78   VirtualBoxVM_NAME    = VirtualBoxVM
    79   VirtualBoxVM_DEFS    = $(VirtualBoxHardened_DEFS) VBOX_RUNTIME_UI
    80  endif
    81 
    82 else # !VBOX_GUI_WITH_SHARED_LIBRARY
    83 
    84  #
    85  # Hardened VirtualBoxVM.
    86  #
    87  VirtualBoxHardenedVM_TEMPLATE = VBOXR3HARDENEDEXE
    88  VirtualBoxHardenedVM_SOURCES = src/hardenedmain.cpp
    89  VirtualBoxHardenedVM_SOURCES.win = src/platform/win/VirtualBoxHardened.rc
    90  VirtualBoxHardenedVM_NAME = VirtualBoxVM
    91  VirtualBoxHardenedVM_DEFS = VBOX_GUI_WITH_SHARED_LIBRARY
    92  VirtualBoxHardenedVM_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows)
    93  src/platform/win/VirtualBoxHardened.rc_INCS  = $(VirtualBox_0_OUTDIR)
    94  src/platform/win/VirtualBoxHardened.rc_DEPS  = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
    95 
    96 endif # !VBOX_GUI_WITH_SHARED_LIBRARY
     52#
     53# Hardened VirtualBoxVM.
     54#
     55VirtualBoxHardenedVM_TEMPLATE = VBOXR3HARDENEDEXE
     56VirtualBoxHardenedVM_SOURCES = src/hardenedmain.cpp
     57VirtualBoxHardenedVM_SOURCES.win = src/platform/win/VirtualBoxHardened.rc
     58VirtualBoxHardenedVM_NAME = VirtualBoxVM
     59VirtualBoxHardenedVM_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows)
     60src/platform/win/VirtualBoxHardened.rc_INCS  = $(VirtualBox_0_OUTDIR)
     61src/platform/win/VirtualBoxHardened.rc_DEPS  = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
    9762
    9863
    … …  
    12590# VirtualBox Manager Application
    12691#
    127 ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    128  VirtualBox_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE)
    129 else
    130  VirtualBox_TEMPLATE := VBOXQTGUIEXE
    131 endif
    132 VirtualBox_NAME = VirtualBox
    133 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    134  VirtualBox_DEPS = $(VBoxGlobal_0_OUTDIR)/include/COMWrappers
    135 endif
    136 # For the launch trick we need different inode numbers.
    137 if !defined(VBOX_WITH_HARDENING) && !defined(VBOX_GUI_WITH_SHARED_LIBRARY)
    138  VirtualBox_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
    139 endif
    140 VirtualBox_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    141 
     92VirtualBox_TEMPLATE      := VBOXQTGUIEXE
     93VirtualBox_NAME           = VirtualBox
     94VirtualBox_DEPS           = $(VBoxGlobal_0_OUTDIR)/include/COMWrappers
     95VirtualBox_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    14296VirtualBox_DEFS           =
    14397VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
    … …  
    155109VirtualBox_DEFS.win       += UNICODE QT_DLL
    156110VirtualBox_DEFS           += \
    157         $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \
    158111        $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
    159112        $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
    … …  
    203156
    204157
    205 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    206 
    207  #
    208  # VirtualBox Virtual Machine Application
    209  #
    210  VirtualBoxVM_TEMPLATE       := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE)
    211  VirtualBoxVM_NAME           = VirtualBoxVM
    212  VirtualBoxVM_DEPS           = $(VBoxGlobal_0_OUTDIR)/include/COMWrappers
    213  VirtualBoxVM_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    214  VirtualBoxVM_DEFS           += VBOX_RUNTIME_UI
    215  VirtualBoxVM_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
    216  VirtualBoxVM_DEFS.linux     = VBOX_WS_X11
    217  VirtualBoxVM_DEFS.solaris   = VBOX_WS_X11
    218  VirtualBoxVM_DEFS.freebsd   = VBOX_WS_X11
    219  VirtualBoxVM_DEFS.darwin    = VBOX_WS_MAC
    220  VirtualBoxVM_DEFS.win       = VBOX_WS_WIN
    221  VirtualBoxVM_DEFS.linux     += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
    222  VirtualBoxVM_DEFS.solaris   += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
    223  VirtualBoxVM_DEFS.freebsd   += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
    224  VirtualBoxVM_DEFS.darwin    += VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS
    225  VirtualBoxVM_DEFS.win       += VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS
    226  VirtualBoxVM_DEFS.darwin    += VBOX_DARWIN_USE_NATIVE_CONTROLS
    227  VirtualBoxVM_DEFS.win       += UNICODE QT_DLL
    228  VirtualBoxVM_DEFS           += \
    229         $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \
     158#
     159# VirtualBox Virtual Machine Application
     160#
     161VirtualBoxVM_TEMPLATE       := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE)
     162VirtualBoxVM_NAME           = VirtualBoxVM
     163VirtualBoxVM_DEPS           = $(VBoxGlobal_0_OUTDIR)/include/COMWrappers
     164VirtualBoxVM_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
     165VirtualBoxVM_DEFS           += VBOX_RUNTIME_UI
     166VirtualBoxVM_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
     167VirtualBoxVM_DEFS.linux     = VBOX_WS_X11
     168VirtualBoxVM_DEFS.solaris   = VBOX_WS_X11
     169VirtualBoxVM_DEFS.freebsd   = VBOX_WS_X11
     170VirtualBoxVM_DEFS.darwin    = VBOX_WS_MAC
     171VirtualBoxVM_DEFS.win       = VBOX_WS_WIN
     172VirtualBoxVM_DEFS.linux     += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
     173VirtualBoxVM_DEFS.solaris   += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
     174VirtualBoxVM_DEFS.freebsd   += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
     175VirtualBoxVM_DEFS.darwin    += VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS
     176VirtualBoxVM_DEFS.win       += VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS
     177VirtualBoxVM_DEFS.darwin    += VBOX_DARWIN_USE_NATIVE_CONTROLS
     178VirtualBoxVM_DEFS.win       += UNICODE QT_DLL
     179VirtualBoxVM_DEFS           += \
    230180        $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
    231181        $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
    … …  
    252202        $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE) \
    253203        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
    254  ifdef VBOX_WITH_DEBUGGER_GUI
    255   VirtualBoxVM_DEFS          += VBOX_WITH_DEBUGGER_GUI
    256   if "$(KBUILD_TYPE)" != "release"
    257    VirtualBoxVM_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
    258   endif
     204ifdef VBOX_WITH_DEBUGGER_GUI
     205 VirtualBoxVM_DEFS          += VBOX_WITH_DEBUGGER_GUI
     206 if "$(KBUILD_TYPE)" != "release"
     207  VirtualBoxVM_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
    259208 endif
    260  ifdef VBOX_WITH_VIDEOHWACCEL
    261   VirtualBoxVM_DEFS          += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
    262  else ifdef VBOX_GUI_USE_QGL
    263   VirtualBoxVM_DEFS          += VBOX_GUI_USE_QGL
    264  endif
    265  ifdef VBOX_WITH_LIBCURL
    266   VirtualBoxVM_DEFS          += VBOX_GUI_WITH_NETWORK_MANAGER
    267   VBOX_GUI_WITH_NETWORK_MANAGER := 1
    268  endif
    269  if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
    270   VirtualBoxVM_DEFS          += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    271  endif
    272  ifndef VBOX_WITHOUT_LESS_VIRTUALBOX_INCLUDING
    273   VirtualBoxVM_DEFS          += VBOX_WITH_LESS_VIRTUALBOX_INCLUDING
    274  endif
    275 
    276 
    277  #
    278  # VirtualBox - GUI Global Shared Library.
    279  #
    280  VBoxGlobal_TEMPLATE = VBOXQTGUI
    281  VBoxGlobal_NAME = VBoxGlobal
    282  VBoxGlobal_DEFS         =
    283  VBoxGlobal_DEFS        += VBOX_GUI_LIBRARY
    284  VBoxGlobal_DEFS.darwin  = VBOX_WS_MAC
    285  VBoxGlobal_DEFS.freebsd = VBOX_WS_X11
    286  VBoxGlobal_DEFS.linux  = VBOX_WS_X11
    287  VBoxGlobal_DEFS.solaris = VBOX_WS_X11
    288  VBoxGlobal_DEFS.win     = VBOX_WS_WIN
    289  VBoxGlobal_DEFS.debug   = VBOX_CHECK_STATE # QT_FATAL_ASSERT
    290  VBoxGlobal_DEFS.darwin  += VBOX_DARWIN_USE_NATIVE_CONTROLS
    291  #VBoxGlobal_DEFS.win     += UNICODE QT_DLL
    292  VBoxGlobal_DEFS         += \
    293         $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \
     209endif
     210ifdef VBOX_WITH_VIDEOHWACCEL
     211 VirtualBoxVM_DEFS          += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
     212else ifdef VBOX_GUI_USE_QGL
     213 VirtualBoxVM_DEFS          += VBOX_GUI_USE_QGL
     214endif
     215ifdef VBOX_WITH_LIBCURL
     216 VirtualBoxVM_DEFS          += VBOX_GUI_WITH_NETWORK_MANAGER
     217 VBOX_GUI_WITH_NETWORK_MANAGER := 1
     218endif
     219if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
     220 VirtualBoxVM_DEFS          += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     221endif
     222ifndef VBOX_WITHOUT_LESS_VIRTUALBOX_INCLUDING
     223 VirtualBoxVM_DEFS          += VBOX_WITH_LESS_VIRTUALBOX_INCLUDING
     224endif
     225
     226
     227#
     228# VirtualBox - GUI Global Shared Library.
     229#
     230VBoxGlobal_TEMPLATE = VBOXQTGUI
     231VBoxGlobal_NAME = VBoxGlobal
     232VBoxGlobal_DEFS         =
     233VBoxGlobal_DEFS        += VBOX_GUI_LIBRARY
     234VBoxGlobal_DEFS.darwin  = VBOX_WS_MAC
     235VBoxGlobal_DEFS.freebsd = VBOX_WS_X11
     236VBoxGlobal_DEFS.linux  = VBOX_WS_X11
     237VBoxGlobal_DEFS.solaris = VBOX_WS_X11
     238VBoxGlobal_DEFS.win     = VBOX_WS_WIN
     239VBoxGlobal_DEFS.debug   = VBOX_CHECK_STATE # QT_FATAL_ASSERT
     240VBoxGlobal_DEFS.darwin  += VBOX_DARWIN_USE_NATIVE_CONTROLS
     241#VBoxGlobal_DEFS.win     += UNICODE QT_DLL
     242VBoxGlobal_DEFS         += \
    294243        $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
    295244        $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS) \
    … …  
    308257        $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE) \
    309258        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
    310  ifdef VBOX_WITH_DEBUGGER_GUI
    311   VBoxGlobal_DEFS        += VBOX_WITH_DEBUGGER_GUI
    312   if "$(KBUILD_TYPE)" != "release"
    313    VBoxGlobal_DEFS       += VBOX_WITH_DEBUGGER_GUI_MENU
    314   endif
     259ifdef VBOX_WITH_DEBUGGER_GUI
     260 VBoxGlobal_DEFS        += VBOX_WITH_DEBUGGER_GUI
     261 if "$(KBUILD_TYPE)" != "release"
     262  VBoxGlobal_DEFS       += VBOX_WITH_DEBUGGER_GUI_MENU
    315263 endif
    316  ifdef VBOX_WITH_VIDEOHWACCEL
    317   VBoxGlobal_DEFS        += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
    318  else ifdef VBOX_GUI_USE_QGL
    319   VBoxGlobal_DEFS        += VBOX_GUI_USE_QGL
    320  endif
    321  ifdef VBOX_WITH_LIBCURL
    322   VBoxGlobal_DEFS        += VBOX_GUI_WITH_NETWORK_MANAGER
    323   VBOX_GUI_WITH_NETWORK_MANAGER := 1
    324  endif
    325  if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
    326   VBoxGlobal_DEFS        += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    327  endif
    328  if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_GUEST_CONTROL_UI)
    329   VBoxGlobal_DEFS        += VBOX_GUI_WITH_GUEST_CONTROL_UI
    330  endif
    331  ifndef VBOX_WITHOUT_LESS_VIRTUALBOX_INCLUDING
    332   VBoxGlobal_DEFS        += VBOX_WITH_LESS_VIRTUALBOX_INCLUDING
    333  endif
    334 
    335 endif # VBOX_GUI_WITH_SHARED_LIBRARY
     264endif
     265ifdef VBOX_WITH_VIDEOHWACCEL
     266 VBoxGlobal_DEFS        += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
     267else ifdef VBOX_GUI_USE_QGL
     268 VBoxGlobal_DEFS        += VBOX_GUI_USE_QGL
     269endif
     270ifdef VBOX_WITH_LIBCURL
     271 VBoxGlobal_DEFS        += VBOX_GUI_WITH_NETWORK_MANAGER
     272 VBOX_GUI_WITH_NETWORK_MANAGER := 1
     273endif
     274if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
     275 VBoxGlobal_DEFS        += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     276endif
     277if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_GUEST_CONTROL_UI)
     278 VBoxGlobal_DEFS        += VBOX_GUI_WITH_GUEST_CONTROL_UI
     279endif
     280ifndef VBOX_WITHOUT_LESS_VIRTUALBOX_INCLUDING
     281 VBoxGlobal_DEFS        += VBOX_WITH_LESS_VIRTUALBOX_INCLUDING
     282endif
    336283
    337284
    … …  
    395342VirtualBox_INCS = \
    396343        $(VBOX_GUI_INC_DIRS) \
    397         $(if-expr defined(VBOX_GUI_WITH_SHARED_LIBRARY),$(VBoxGlobal_0_OUTDIR)/include,$(VirtualBox_0_OUTDIR)/include) \
     344        $(VBoxGlobal_0_OUTDIR)/include \
    398345        $(VBOX_GRAPHICS_INCS)
    399346
    400 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    401 
    402  #
    403  # VirtualBox Virtual Machine Application
    404  # Include folders.
    405  #
    406  VirtualBoxVM_INCS = \
     347#
     348# VirtualBox Virtual Machine Application
     349# Include folders.
     350#
     351VirtualBoxVM_INCS = \
    407352        $(VBOX_GUI_INC_DIRS) \
    408353        $(VBoxGlobal_0_OUTDIR)/include \
    409354        $(VBOX_GRAPHICS_INCS)
    410355
    411  #
    412  # VirtualBox - GUI Global Shared Library.
    413  # Include folders.
    414  #
    415  VBoxGlobal_INCS = \
     356#
     357# VirtualBox - GUI Global Shared Library.
     358# Include folders.
     359#
     360VBoxGlobal_INCS = \
    416361        $(VBOX_GUI_INC_DIRS) \
    417362        $(VBoxGlobal_0_OUTDIR)/include
    418 
    419 endif # VBOX_GUI_WITH_SHARED_LIBRARY
    420363
    421364
    … …  
    448391VirtualBox_LDFLAGS.darwin = \
    449392        -framework AppKit -framework Carbon -framework IOKit
    450 ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    451  VirtualBox_LDFLAGS.darwin += \
    452         $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBox.dylib)
    453 endif
    454393
    455394if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    … …  
    458397
    459398
    460 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    461 
    462  #
    463  # VirtualBox Virtual Machine Application
    464  # Compiling/linking flags.
    465  #
    466  ifneq ($(KBUILD_TARGET),win)
    467   VirtualBoxVM_CXXFLAGS += -Wno-switch
    468  endif
    469 
    470  ## @todo we're using a number of deprecated APIs, please fix and remove these!
    471  ifdef VBOX_WITH_NEW_XCODE
    472   VirtualBoxVM_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
    473   VirtualBoxVM_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
    474   VirtualBoxVM_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
    475  else
    476   VirtualBoxVM_CXXFLAGS.darwin    += -Wno-deprecated-declarations
    477   VirtualBoxVM_OBJCFLAGS.darwin   += -Wno-deprecated-declarations
    478   VirtualBoxVM_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations
    479  endif
    480 
    481  ifeq ($(KBUILD_TYPE),release)
    482   VirtualBoxVM_LDFLAGS.win   += /SUBSYSTEM:windows
    483  else
    484   VirtualBoxVM_LDFLAGS.linux += -rdynamic # for backtrace_symbols()
    485   VirtualBoxVM_LDFLAGS.win   += /SUBSYSTEM:console
    486  endif
    487 
    488  VirtualBoxVM_LDFLAGS.darwin = \
     399#
     400# VirtualBox Virtual Machine Application
     401# Compiling/linking flags.
     402#
     403ifneq ($(KBUILD_TARGET),win)
     404 VirtualBoxVM_CXXFLAGS += -Wno-switch
     405endif
     406
     407## @todo we're using a number of deprecated APIs, please fix and remove these!
     408ifdef VBOX_WITH_NEW_XCODE
     409 VirtualBoxVM_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
     410 VirtualBoxVM_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
     411 VirtualBoxVM_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
     412else
     413 VirtualBoxVM_CXXFLAGS.darwin    += -Wno-deprecated-declarations
     414 VirtualBoxVM_OBJCFLAGS.darwin   += -Wno-deprecated-declarations
     415 VirtualBoxVM_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations
     416endif
     417
     418ifeq ($(KBUILD_TYPE),release)
     419 VirtualBoxVM_LDFLAGS.win   += /SUBSYSTEM:windows
     420else
     421 VirtualBoxVM_LDFLAGS.linux += -rdynamic # for backtrace_symbols()
     422 VirtualBoxVM_LDFLAGS.win   += /SUBSYSTEM:console
     423endif
     424
     425VirtualBoxVM_LDFLAGS.darwin = \
    489426        -framework AppKit -framework Carbon -framework IOKit \
    490427        $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBoxVM.dylib)
    491428
    492  if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    493   VirtualBoxVM_LDFLAGS.darwin += -framework OpenGL
    494  endif
    495 
    496 
    497  #
    498  # VirtualBox - GUI Global Shared Library.
    499  # Compiling/linking flags.
    500  #
    501 
    502  ## @todo we're using a number of deprecated APIs, please fix and remove these!
    503  ifdef VBOX_WITH_NEW_XCODE
    504   VBoxGlobal_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
    505   VBoxGlobal_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
    506   VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
    507  else
    508   VBoxGlobal_CXXFLAGS.darwin    += -Wno-deprecated-declarations
    509   VBoxGlobal_OBJCFLAGS.darwin   += -Wno-deprecated-declarations
    510   VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations
    511  endif
    512 
    513  VBoxGlobal_LDFLAGS.darwin = \
     429if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
     430 VirtualBoxVM_LDFLAGS.darwin += -framework OpenGL
     431endif
     432
     433
     434#
     435# VirtualBox - GUI Global Shared Library.
     436# Compiling/linking flags.
     437#
     438
     439## @todo we're using a number of deprecated APIs, please fix and remove these!
     440ifdef VBOX_WITH_NEW_XCODE
     441 VBoxGlobal_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
     442 VBoxGlobal_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
     443 VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
     444else
     445 VBoxGlobal_CXXFLAGS.darwin    += -Wno-deprecated-declarations
     446 VBoxGlobal_OBJCFLAGS.darwin   += -Wno-deprecated-declarations
     447 VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations
     448endif
     449
     450VBoxGlobal_LDFLAGS.darwin = \
    514451        -framework AppKit -framework Carbon -framework IOKit \
    515452        $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxGlobal.dylib)
    516453
    517  if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    518   VBoxGlobal_LDFLAGS.darwin += -framework OpenGL
    519  endif
    520 
    521 endif # VBOX_GUI_WITH_SHARED_LIBRARY
     454if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
     455 VBoxGlobal_LDFLAGS.darwin += -framework OpenGL
     456endif
    522457
    523458
    … …  
    568503
    569504# This one is global shared GUI library:
    570 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    571  ifeq ($(KBUILD_TARGET),win)
    572   VirtualBox_LIBS += $(PATH_STAGE_LIB)/VBoxGlobal$(VBOX_SUFF_LIB)
    573  else
    574   VirtualBox_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)
    575  endif
    576 endif
    577 
    578 
    579 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    580 
    581  #
    582  # VirtualBox Virtual Machine Application
    583  # Libraries.
    584  #
    585 
    586  # Library required for the hdd backend enumeration:
    587  VirtualBoxVM_LIBS = $(LIB_DDU)
    588 
    589  # Runtime library loader required on X11 hosts:
    590  if1of ($(KBUILD_TARGET), linux netbsd openbsd)
    591   VirtualBoxVM_LIBS += dl
    592  endif
    593 
    594  # Xinerama library required for multi-monitor support:
    595  VirtualBoxVM_LIBS.linux   += Xinerama
    596  VirtualBoxVM_LIBS.solaris += Xinerama
    597  VirtualBoxVM_LIBS.freebsd += Xinerama
    598 
    599  # XCB library required for direct XCB native code support:
    600  VirtualBoxVM_LIBS.linux   += xcb
    601  VirtualBoxVM_LIBS.solaris += xcb
    602  VirtualBoxVM_LIBS.freebsd += xcb
    603 
    604  # Various Windows hosts libraries:
    605  VirtualBoxVM_LIBS.win = \
     505ifeq ($(KBUILD_TARGET),win)
     506 VirtualBox_LIBS += $(PATH_STAGE_LIB)/VBoxGlobal$(VBOX_SUFF_LIB)
     507else
     508 VirtualBox_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)
     509endif
     510
     511
     512#
     513# VirtualBox Virtual Machine Application
     514# Libraries.
     515#
     516
     517# Library required for the hdd backend enumeration:
     518VirtualBoxVM_LIBS = $(LIB_DDU)
     519
     520# Runtime library loader required on X11 hosts:
     521if1of ($(KBUILD_TARGET), linux netbsd openbsd)
     522 VirtualBoxVM_LIBS += dl
     523endif
     524
     525# Xinerama library required for multi-monitor support:
     526VirtualBoxVM_LIBS.linux   += Xinerama
     527VirtualBoxVM_LIBS.solaris += Xinerama
     528VirtualBoxVM_LIBS.freebsd += Xinerama
     529
     530# XCB library required for direct XCB native code support:
     531VirtualBoxVM_LIBS.linux   += xcb
     532VirtualBoxVM_LIBS.solaris += xcb
     533VirtualBoxVM_LIBS.freebsd += xcb
     534
     535# Various Windows hosts libraries:
     536VirtualBoxVM_LIBS.win = \
    606537        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib \
    607538        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
    608539        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
    609540
    610  # VBox keyboard shared library for X11 hosts:
    611  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
    612   VirtualBoxVM_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
     541# VBox keyboard shared library for X11 hosts:
     542if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
     543 VirtualBoxVM_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
     544endif
     545
     546# These are 2D Video Acceleration and 3D Acceleration related libs:
     547if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
     548 VirtualBoxVM_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
     549 VirtualBoxVM_LIBS.solaris   += GL
     550 VirtualBoxVM_LIBS.linux     += GL
     551 VirtualBoxVM_LIBS.freebsd   += GL
     552endif
     553ifdef VBOX_WITH_CROGL
     554 VirtualBoxVM_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
     555endif
     556
     557ifeq ($(KBUILD_TARGET),win)
     558 VirtualBoxVM_LIBS += $(PATH_STAGE_LIB)/VBoxGlobal$(VBOX_SUFF_LIB)
     559else
     560 VirtualBoxVM_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)
     561endif
     562
     563
     564#
     565# VirtualBox - GUI Global Shared Library.
     566# Libraries.
     567#
     568
     569# Xinerama library required for multi-monitor support:
     570VBoxGlobal_LIBS.linux   += Xinerama
     571VBoxGlobal_LIBS.solaris += Xinerama
     572VBoxGlobal_LIBS.freebsd += Xinerama
     573
     574# Various Windows hosts libraries:
     575VBoxGlobal_LIBS.win = \
     576        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib
     577
     578# VBox keyboard shared library for X11 hosts:
     579if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
     580 VBoxGlobal_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
     581endif
     582
     583# These are 2D Video Acceleration and 3D Acceleration related libs:
     584if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
     585 VBoxGlobal_LIBS.win     += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
     586 VBoxGlobal_LIBS.solaris += GL
     587 VBoxGlobal_LIBS.linux   += GL
     588 VBoxGlobal_LIBS.freebsd += GL
     589endif
     590ifdef VBOX_WITH_CROGL
     591 VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
     592endif
     593if defined(VBOX_WITH_VIDEOHWACCEL)
     594 if1of ($(KBUILD_TARGET), win linux freebsd)
     595  VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB)
    613596 endif
    614 
    615  # These are 2D Video Acceleration and 3D Acceleration related libs:
    616  if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    617   VirtualBoxVM_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    618   VirtualBoxVM_LIBS.solaris   += GL
    619   VirtualBoxVM_LIBS.linux     += GL
    620   VirtualBoxVM_LIBS.freebsd   += GL
    621  endif
    622  ifdef VBOX_WITH_CROGL
    623   VirtualBoxVM_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
    624  endif
    625 
    626  # This one is global shared GUI library:
    627  ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    628   ifeq ($(KBUILD_TARGET),win)
    629    VirtualBoxVM_LIBS += $(PATH_STAGE_LIB)/VBoxGlobal$(VBOX_SUFF_LIB)
    630   else
    631    VirtualBoxVM_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)
    632   endif
    633  endif
    634 
    635 
    636  #
    637  # VirtualBox - GUI Global Shared Library.
    638  # Libraries.
    639  #
    640 
    641  # Xinerama library required for multi-monitor support:
    642  VBoxGlobal_LIBS.linux   += Xinerama
    643  VBoxGlobal_LIBS.solaris += Xinerama
    644  VBoxGlobal_LIBS.freebsd += Xinerama
    645 
    646  # Various Windows hosts libraries:
    647  VBoxGlobal_LIBS.win = \
    648         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib
    649 
    650  # VBox keyboard shared library for X11 hosts:
    651  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
    652   VBoxGlobal_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
    653  endif
    654 
    655  # These are 2D Video Acceleration and 3D Acceleration related libs:
    656  if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    657   VBoxGlobal_LIBS.win     += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    658   VBoxGlobal_LIBS.solaris += GL
    659   VBoxGlobal_LIBS.linux   += GL
    660   VBoxGlobal_LIBS.freebsd += GL
    661  endif
    662  ifdef VBOX_WITH_CROGL
    663   VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
    664  endif
    665  if defined(VBOX_WITH_VIDEOHWACCEL)
    666   if1of ($(KBUILD_TARGET), win linux freebsd)
    667    VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB)
    668   endif
    669  endif
    670 
    671 endif # VBOX_GUI_WITH_SHARED_LIBRARY
     597endif
    672598
    673599
    … …  
    761687        src/manager/tools/UIToolsItem.h
    762688
    763 ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    764  VirtualBox_QT_MOCHDRS += \
    765         src/VBoxAboutDlg.h \
    766         src/VBoxLicenseViewer.h \
    767         src/UITakeSnapshotDialog.h \
    768         src/extensions/QIAdvancedSlider.h \
    769         src/extensions/QIArrowButtonPress.h \
    770         src/extensions/QIArrowButtonSwitch.h \
    771         src/extensions/QIArrowSplitter.h \
    772         src/extensions/QIComboBox.h \
    773         src/extensions/QIDialog.h \
    774         src/extensions/QIDialogButtonBox.h \
    775         src/extensions/QIFileDialog.h \
    776         src/extensions/QIFlowLayout.h \
    777         src/extensions/QIInputDialog.h \
    778         src/extensions/QILabel.h \
    779         src/extensions/QILabelSeparator.h \
    780         src/extensions/QILineEdit.h \
    781         src/extensions/QIMainDialog.h \
    782         src/extensions/QIMainWindow.h \
    783         src/extensions/QIManagerDialog.h \
    784         src/extensions/QIMenu.h \
    785         src/extensions/QIMessageBox.h \
    786         src/extensions/QIProcess.h \
    787         src/extensions/QIRichTextLabel.h \
    788         src/extensions/QIRichToolButton.h \
    789         src/extensions/QISplitter.h \
    790         src/extensions/QIStatusBar.h \
    791         src/extensions/QIStatusBarIndicator.h \
    792         src/extensions/QIStyledItemDelegate.h \
    793         src/extensions/QITableView.h \
    794         src/extensions/QITabWidget.h \
    795         src/extensions/QIToolButton.h \
    796         src/extensions/QITreeView.h \
    797         src/extensions/QITreeWidget.h \
    798         src/extensions/QIWidgetValidator.h \
    799         src/extensions/graphics/QIGraphicsView.h \
    800         src/extensions/graphics/QIGraphicsWidget.h \
    801         src/extradata/UIExtraDataDefs.h \
    802         src/extradata/UIExtraDataManager.h \
    803         src/globals/UIActionPool.h \
    804         src/globals/UIActionPoolManager.h \
    805         src/globals/UIActionPoolRuntime.h \
    806         src/globals/UIAnimationFramework.h \
    807         src/globals/UICustomFileSystemModel.h \
    808         src/globals/UIDesktopWidgetWatchdog.h \
    809         src/globals/UIMainEventListener.h \
    810         src/globals/UIMessageCenter.h \
    811         src/globals/UIModalWindowManager.h \
    812         src/globals/UIPopupCenter.h \
    813         src/globals/UIProgressEventHandler.h \
    814         src/globals/UIShortcutPool.h \
    815         src/globals/UIThreadPool.h \
    816         src/globals/UIVirtualBoxEventHandler.h \
    817         src/globals/VBoxGlobal.h \
    818         src/globals/VBoxUtils.h \
    819         src/logviewer/UIVMLogPage.h \
    820         src/logviewer/UIVMLogViewerBookmarksPanel.h \
    821         src/logviewer/UIVMLogViewerDialog.h \
    822         src/logviewer/UIVMLogViewerFilterPanel.h \
    823         src/logviewer/UIVMLogViewerOptionsPanel.h \
    824         src/logviewer/UIVMLogViewerPanel.h \
    825         src/logviewer/UIVMLogViewerSearchPanel.h \
    826         src/logviewer/UIVMLogViewerTextEdit.h \
    827         src/logviewer/UIVMLogViewerWidget.h \
    828         src/medium/UIFDCreationDialog.h \
    829         src/medium/UIMediumEnumerator.h \
    830         src/medium/UIMediumItem.h \
    831         src/medium/UIMediumSelector.h \
    832         src/medium/viso/UIVisoBrowserBase.h \
    833         src/medium/viso/UIVisoContentBrowser.h \
    834         src/medium/viso/UIVisoCreator.h \
    835         src/medium/viso/UIVisoConfigurationDialog.h \
    836         src/medium/viso/UIVisoCreatorOptionsDialog.h \
    837         src/medium/viso/UIVisoHostBrowser.h \
    838         src/runtime/UIConsoleEventHandler.h \
    839         src/runtime/UIFrameBuffer.h \
    840         src/runtime/UIIndicatorsPool.h \
    841         src/runtime/UIKeyboardHandler.h \
    842         src/runtime/UIMachine.h \
    843         src/runtime/UIMachineLogic.h \
    844         src/runtime/UIMachineWindow.h \
    845         src/runtime/UIMachineView.h \
    846         src/runtime/UIMouseHandler.h \
    847         src/runtime/UIMultiScreenLayout.h \
    848         src/runtime/UISession.h \
    849         src/runtime/UIVMCloseDialog.h \
    850         src/runtime/fullscreen/UIKeyboardHandlerFullscreen.h \
    851         src/runtime/fullscreen/UIMachineLogicFullscreen.h \
    852         src/runtime/fullscreen/UIMachineViewFullscreen.h \
    853         src/runtime/fullscreen/UIMachineWindowFullscreen.h \
    854         src/runtime/information/UIInformationConfiguration.h \
    855         src/runtime/information/UIInformationDataItem.h \
    856         src/runtime/information/UIInformationItem.h \
    857         src/runtime/information/UIInformationModel.h \
    858         src/runtime/information/UIInformationRuntime.h \
    859         src/runtime/information/UIInformationView.h \
    860         src/runtime/information/UIVMInformationDialog.h \
    861         src/guestctrl/UIGuestControlConsole.h \
    862         src/guestctrl/UIFileManager.h \
    863         src/guestctrl/UIFileManagerDialog.h \
    864         src/guestctrl/UIFileManagerLogPanel.h \
    865         src/guestctrl/UIFileManagerOperationsPanel.h \
    866         src/guestctrl/UIFileManagerOptionsPanel.h \
    867         src/guestctrl/UIFileManagerPanel.h \
    868         src/guestctrl/UIFileManagerSessionPanel.h \
    869         src/guestctrl/UIFileManagerTable.h \
    870         src/guestctrl/UIGuestControlInterface.h \
    871         src/guestctrl/UIGuestControlTreeItem.h \
    872         src/guestctrl/UIFileManagerGuestTable.h \
    873         src/guestctrl/UIGuestProcessControlDialog.h \
    874         src/guestctrl/UIGuestProcessControlWidget.h \
    875         src/guestctrl/UIFileManagerHostTable.h \
    876         src/runtime/normal/UIKeyboardHandlerNormal.h \
    877         src/runtime/normal/UIMachineLogicNormal.h \
    878         src/runtime/normal/UIMachineViewNormal.h \
    879         src/runtime/normal/UIMachineWindowNormal.h \
    880         src/runtime/scale/UIKeyboardHandlerScale.h \
    881         src/runtime/scale/UIMachineLogicScale.h \
    882         src/runtime/scale/UIMachineViewScale.h \
    883         src/runtime/scale/UIMachineWindowScale.h \
    884         src/runtime/seamless/UIKeyboardHandlerSeamless.h \
    885         src/runtime/seamless/UIMachineLogicSeamless.h \
    886         src/runtime/seamless/UIMachineViewSeamless.h \
    887         src/runtime/seamless/UIMachineWindowSeamless.h \
    888         src/settings/UISettingsDialog.h \
    889         src/settings/UISettingsDialogSpecific.h \
    890         src/settings/UISettingsPage.h \
    891         src/settings/UISettingsSelector.h \
    892         src/settings/UISettingsSerializer.h \
    893         src/settings/global/UIGlobalSettingsExtension.h \
    894         src/settings/global/UIGlobalSettingsGeneral.h \
    895         src/settings/global/UIGlobalSettingsInput.h \
    896         src/settings/global/UIGlobalSettingsLanguage.h \
    897         src/settings/global/UIGlobalSettingsDisplay.h \
    898         src/settings/global/UIGlobalSettingsNetwork.h \
    899         src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h \
    900         src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
    901         src/settings/machine/UIMachineSettingsAudio.h \
    902         src/settings/machine/UIMachineSettingsDisplay.h \
    903         src/settings/machine/UIMachineSettingsGeneral.h \
    904         src/settings/machine/UIMachineSettingsInterface.h \
    905         src/settings/machine/UIMachineSettingsNetwork.h \
    906         src/settings/machine/UIMachineSettingsPortForwardingDlg.h \
    907         src/settings/machine/UIMachineSettingsSF.h \
    908         src/settings/machine/UIMachineSettingsSFDetails.h \
    909         src/settings/machine/UIMachineSettingsSerial.h \
    910         src/settings/machine/UIMachineSettingsStorage.h \
    911         src/settings/machine/UIMachineSettingsSystem.h \
    912         src/settings/machine/UIMachineSettingsUSB.h \
    913         src/settings/machine/UIMachineSettingsUSBFilterDetails.h \
    914         src/widgets/UIAddDiskEncryptionPasswordDialog.h \
    915         src/widgets/UIBootTable.h \
    916         src/widgets/UIFilePathSelector.h \
    917         src/widgets/UIFilmContainer.h \
    918         src/widgets/UIGuestRAMSlider.h \
    919         src/widgets/UIHostComboEditor.h \
    920         src/widgets/UIHotKeyEditor.h \
    921         src/widgets/UIMediaComboBox.h \
    922         src/widgets/UIMediumSizeEditor.h \
    923         src/widgets/UIMenuBar.h \
    924         src/widgets/UIMenuBarEditorWindow.h \
    925         src/widgets/UIMiniToolBar.h \
    926         src/widgets/UINameAndSystemEditor.h \
    927         src/widgets/UIPopupBox.h \
    928         src/widgets/UIPopupPane.h \
    929         src/widgets/UIPopupPaneButtonPane.h \
    930         src/widgets/UIPopupPaneMessage.h \
    931         src/widgets/UIPopupPaneDetails.h \
    932         src/widgets/UIPopupStack.h \
    933         src/widgets/UIPopupStackViewport.h \
    934         src/widgets/UIPortForwardingTable.h \
    935         src/widgets/UIProgressDialog.h \
    936         src/widgets/UIScaleFactorEditor.h \
    937         src/widgets/UISlidingToolBar.h \
    938         src/widgets/UISpecialControls.h \
    939         src/widgets/UIStatusBarEditorWindow.h \
    940         src/widgets/UIToolBar.h \
    941         src/widgets/UIWarningPane.h \
    942         src/wizards/UIWizard.h \
    943         src/wizards/UIWizardPage.h \
    944         src/wizards/firstrun/UIWizardFirstRun.h \
    945         src/wizards/firstrun/UIWizardFirstRunPageBasic.h \
    946         src/wizards/newvd/UIWizardNewVD.h \
    947         src/wizards/newvd/UIWizardNewVDPageBasic1.h \
    948         src/wizards/newvd/UIWizardNewVDPageBasic2.h \
    949         src/wizards/newvd/UIWizardNewVDPageBasic3.h \
    950         src/wizards/newvd/UIWizardNewVDPageExpert.h
    951 
    952  ifdef VBOX_WITH_DRAG_AND_DROP
    953   VirtualBox_QT_MOCHDRS += \
    954         src/runtime/UIDnDHandler.h
    955   ifdef VBOX_WITH_DRAG_AND_DROP_GH
    956    VirtualBox_QT_MOCHDRS += \
    957         src/runtime/UIDnDMIMEData.h
    958   endif
    959  endif
    960 
    961  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    962   VirtualBox_QT_MOCHDRS += \
    963         src/net/UIDownloader.h \
    964         src/net/UIDownloaderAdditions.h \
    965         src/net/UIDownloaderExtensionPack.h \
    966         src/net/UIDownloaderUserManual.h \
    967         src/net/UINetworkCustomer.h \
    968         src/net/UINetworkManager.h \
    969         src/net/UINetworkManagerDialog.h \
    970         src/net/UINetworkManagerIndicator.h \
    971         src/net/UINetworkRequest.h \
    972         src/net/UINetworkRequestWidget.h \
    973         src/net/UINetworkReply.h \
    974         src/net/UIUpdateManager.h \
    975         src/settings/global/UIGlobalSettingsProxy.h \
    976         src/settings/global/UIGlobalSettingsUpdate.h
    977  endif
    978 
    979  VirtualBox_QT_MOCHDRS.darwin += \
    980         src/platform/darwin/UICocoaSpecialControls.h \
    981         src/platform/darwin/UIWindowMenuManager.h
    982 endif
    983 
    984 
    985 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    986 
    987  #
    988  # VirtualBox Virtual Machine Application
    989  # Headers containing definitions of classes that use the Q_OBJECT macro.
    990  #
    991  VirtualBoxVM_QT_MOCHDRS = \
     689
     690#
     691# VirtualBox Virtual Machine Application
     692# Headers containing definitions of classes that use the Q_OBJECT macro.
     693#
     694VirtualBoxVM_QT_MOCHDRS = \
    992695        src/globals/UIStarter.h \
    993696        src/runtime/UIConsoleEventHandler.h \
    … …  
    1045748        src/wizards/firstrun/UIWizardFirstRunPageBasic.h
    1046749
    1047  ifdef VBOX_WITH_DRAG_AND_DROP
     750ifdef VBOX_WITH_DRAG_AND_DROP
     751 VirtualBoxVM_QT_MOCHDRS += \
     752        src/runtime/UIDnDHandler.h
     753 ifdef VBOX_WITH_DRAG_AND_DROP_GH
    1048754  VirtualBoxVM_QT_MOCHDRS += \
    1049         src/runtime/UIDnDHandler.h
    1050   ifdef VBOX_WITH_DRAG_AND_DROP_GH
    1051    VirtualBoxVM_QT_MOCHDRS += \
    1052755        src/runtime/UIDnDMIMEData.h
    1053   endif
    1054756 endif
    1055 
    1056 
    1057  #
    1058  # VirtualBox - GUI Global Shared Library.
    1059  # Headers containing definitions of classes that use the Q_OBJECT macro.
    1060  #
    1061  VBoxGlobal_QT_MOCHDRS = \
     757endif
     758
     759
     760#
     761# VirtualBox - GUI Global Shared Library.
     762# Headers containing definitions of classes that use the Q_OBJECT macro.
     763#
     764VBoxGlobal_QT_MOCHDRS = \
    1062765        src/VBoxAboutDlg.h \
    1063766        src/VBoxLicenseViewer.h \
    … …  
    1195898        src/wizards/newvd/UIWizardNewVDPageExpert.h
    1196899
    1197  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    1198   VBoxGlobal_QT_MOCHDRS += \
     900ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     901 VBoxGlobal_QT_MOCHDRS += \
    1199902        src/net/UIDownloader.h \
    1200903        src/net/UIDownloaderAdditions.h \
    … …  
    1211914        src/settings/global/UIGlobalSettingsProxy.h \
    1212915        src/settings/global/UIGlobalSettingsUpdate.h
    1213  endif
    1214 
    1215  VBoxGlobal_QT_MOCHDRS.darwin += \
     916endif
     917
     918VBoxGlobal_QT_MOCHDRS.darwin += \
    1216919        src/platform/darwin/UICocoaSpecialControls.h \
    1217920        src/platform/darwin/UIWindowMenuManager.h
    1218 
    1219 endif # VBOX_GUI_WITH_SHARED_LIBRARY
    1220921
    1221922
    … …  
    1236937        src/manager/UIWelcomePane.cpp
    1237938
    1238 ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    1239  VirtualBox_QT_MOCSRCS += \
    1240         src/extensions/QIAdvancedSlider.cpp \
    1241         src/extensions/QIArrowSplitter.cpp \
    1242         src/extensions/QISplitter.cpp \
    1243         src/extradata/UIExtraDataManager.cpp \
    1244         src/globals/UIActionPool.cpp \
    1245         src/globals/UIActionPoolManager.cpp \
    1246         src/globals/UIActionPoolRuntime.cpp \
    1247         src/globals/UIMainEventListener.cpp \
    1248         src/globals/UIThreadPool.cpp \
    1249         src/globals/UIVirtualBoxEventHandler.cpp \
    1250         src/logviewer/UIVMLogViewerFilterPanel.cpp \
    1251         src/logviewer/UIVMLogViewerSearchPanel.cpp \
    1252         src/logviewer/UIVMLogViewerTextEdit.cpp \
    1253         src/medium/UIMediumEnumerator.cpp \
    1254         src/medium/UIMediumSelector.cpp \
    1255         src/medium/viso/UIVisoContentBrowser.cpp \
    1256         src/medium/viso/UIVisoHostBrowser.cpp \
    1257         src/runtime/UIConsoleEventHandler.cpp \
    1258         src/runtime/UIFrameBuffer.cpp \
    1259         src/runtime/UIIndicatorsPool.cpp \
    1260         src/guestctrl/UIFileManager.cpp \
    1261         src/guestctrl/UIFileManagerLogPanel.cpp \
    1262         src/guestctrl/UIFileManagerOperationsPanel.cpp \
    1263         src/guestctrl/UIFileManagerTable.cpp \
    1264         src/guestctrl/UIFileManagerGuestTable.cpp \
    1265         src/guestctrl/UIGuestProcessControlWidget.cpp \
    1266         src/guestctrl/UIFileManagerHostTable.cpp \
    1267         src/settings/global/UIGlobalSettingsExtension.cpp \
    1268         src/settings/global/UIGlobalSettingsInput.cpp \
    1269         src/settings/global/UIGlobalSettingsLanguage.cpp \
    1270         src/settings/global/UIGlobalSettingsNetwork.cpp \
    1271         src/settings/machine/UIMachineSettingsNetwork.cpp \
    1272         src/settings/machine/UIMachineSettingsSerial.cpp \
    1273         src/settings/machine/UIMachineSettingsSF.cpp \
    1274         src/settings/machine/UIMachineSettingsStorage.cpp \
    1275         src/settings/machine/UIMachineSettingsUSB.cpp \
    1276         src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    1277         src/widgets/UIFilmContainer.cpp \
    1278         src/widgets/UIHotKeyEditor.cpp \
    1279         src/widgets/UIMiniToolBar.cpp \
    1280         src/widgets/UIPortForwardingTable.cpp \
    1281         src/widgets/UIStatusBarEditorWindow.cpp
    1282 
    1283  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    1284   VirtualBox_QT_MOCSRCS += \
    1285         src/net/UINetworkReply.cpp \
    1286         src/net/UIUpdateManager.cpp
    1287  endif
    1288 
    1289  ifdef VBOX_WITH_XPCOM
    1290   VirtualBox_QT_MOCSRCS += \
    1291         src/globals/COMDefs.cpp
    1292  endif
    1293 
    1294  VirtualBox_QT_MOCSRCS.darwin += \
    1295         src/platform/darwin/UIWindowMenuManager.cpp
    1296 
    1297  VirtualBox_QT_MOCSRCS.linux += \
    1298         src/globals/UIDesktopWidgetWatchdog.cpp
    1299  VirtualBox_QT_MOCSRCS.solaris += \
    1300         src/globals/UIDesktopWidgetWatchdog.cpp
    1301  VirtualBox_QT_MOCSRCS.freebsd += \
    1302         src/globals/UIDesktopWidgetWatchdog.cpp
    1303 endif # VBOX_GUI_WITH_SHARED_LIBRARY
    1304 
    1305 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    1306 
    1307  #
    1308  # VirtualBox Virtual Machine Application
    1309  # Sources containing local definitions of classes that use the Q_OBJECT macro.
    1310  #
    1311  VirtualBoxVM_QT_MOCSRCS = \
     939
     940#
     941# VirtualBox Virtual Machine Application
     942# Sources containing local definitions of classes that use the Q_OBJECT macro.
     943#
     944VirtualBoxVM_QT_MOCSRCS = \
    1312945        src/runtime/UIConsoleEventHandler.cpp \
    1313946        src/runtime/UIFrameBuffer.cpp \
    … …  
    1324957
    1325958
    1326  #
    1327  # VirtualBox - GUI Global Shared Library.
    1328  # Sources.
    1329  #
    1330  VBoxGlobal_QT_MOCSRCS = \
     959#
     960# VirtualBox - GUI Global Shared Library.
     961# Sources.
     962#
     963VBoxGlobal_QT_MOCSRCS = \
    1331964        src/extensions/QIAdvancedSlider.cpp \
    1332965        src/extensions/QIArrowSplitter.cpp \
    … …  
    1361994        src/widgets/UIStatusBarEditorWindow.cpp
    1362995
    1363  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    1364   VBoxGlobal_QT_MOCSRCS += \
     996ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     997 VBoxGlobal_QT_MOCSRCS += \
    1365998        src/net/UINetworkReply.cpp \
    1366999        src/net/UIUpdateManager.cpp
    1367  endif
    1368 
    1369  ifdef VBOX_WITH_XPCOM
    1370   VBoxGlobal_QT_MOCSRCS += \
     1000endif
     1001
     1002ifdef VBOX_WITH_XPCOM
     1003 VBoxGlobal_QT_MOCSRCS += \
    13711004        src/globals/COMDefs.cpp
    1372  endif
    1373 
    1374  VBoxGlobal_QT_MOCSRCS.darwin += \
     1005endif
     1006
     1007VBoxGlobal_QT_MOCSRCS.darwin += \
    13751008        src/platform/darwin/UIWindowMenuManager.cpp
    13761009
    1377  VBoxGlobal_QT_MOCSRCS.linux += \
     1010VBoxGlobal_QT_MOCSRCS.linux += \
    13781011        src/globals/UIDesktopWidgetWatchdog.cpp
    1379  VBoxGlobal_QT_MOCSRCS.solaris += \
     1012VBoxGlobal_QT_MOCSRCS.solaris += \
    13801013        src/globals/UIDesktopWidgetWatchdog.cpp
    1381  VBoxGlobal_QT_MOCSRCS.freebsd += \
     1014VBoxGlobal_QT_MOCSRCS.freebsd += \
    13821015        src/globals/UIDesktopWidgetWatchdog.cpp
    1383 
    1384 endif # VBOX_GUI_WITH_SHARED_LIBRARY
    13851016
    13861017
    … …  
    14961127endif
    14971128
    1498 ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    1499  VirtualBox_SOURCES += \
    1500         src/VBoxAboutDlg.cpp \
    1501         src/VBoxLicenseViewer.cpp \
    1502         src/UITakeSnapshotDialog.cpp \
    1503         src/extensions/QIAdvancedSlider.cpp \
    1504         src/extensions/QIArrowButtonPress.cpp \
    1505         src/extensions/QIArrowButtonSwitch.cpp \
    1506         src/extensions/QIArrowSplitter.cpp \
    1507         src/extensions/QIComboBox.cpp \
    1508         src/extensions/QIDialog.cpp \
    1509         src/extensions/QIDialogButtonBox.cpp \
    1510         src/extensions/QIFileDialog.cpp \
    1511         src/extensions/QIFlowLayout.cpp \
    1512         src/extensions/QIInputDialog.cpp \
    1513         src/extensions/QILabel.cpp \
    1514         src/extensions/QILabelSeparator.cpp \
    1515         src/extensions/QILineEdit.cpp \
    1516         src/extensions/QIMainDialog.cpp \
    1517         src/extensions/QIMainWindow.cpp \
    1518         src/extensions/QIManagerDialog.cpp \
    1519         src/extensions/QIMenu.cpp \
    1520         src/extensions/QIMessageBox.cpp \
    1521         src/extensions/QIProcess.cpp \
    1522         src/extensions/QIRichTextLabel.cpp \
    1523         src/extensions/QIRichToolButton.cpp \
    1524         src/extensions/QISplitter.cpp \
    1525         src/extensions/QIStatusBar.cpp \
    1526         src/extensions/QIStatusBarIndicator.cpp \
    1527         src/extensions/QIStyledItemDelegate.cpp \
    1528         src/extensions/QITableView.cpp \
    1529         src/extensions/QITabWidget.cpp \
    1530         src/extensions/QIToolButton.cpp \
    1531         src/extensions/QITreeView.cpp \
    1532         src/extensions/QITreeWidget.cpp \
    1533         src/extensions/QIWidgetValidator.cpp \
    1534         src/extensions/graphics/QIGraphicsView.cpp \
    1535         src/extensions/graphics/QIGraphicsWidget.cpp \
    1536         src/extradata/UIExtraDataDefs.cpp \
    1537         src/extradata/UIExtraDataManager.cpp \
    1538         src/converter/UIConverter.cpp \
    1539         src/converter/UIConverterBackendCOM.cpp \
    1540         src/converter/UIConverterBackendGlobal.cpp \
    1541         src/globals/COMDefs.cpp \
    1542         src/globals/UIActionPool.cpp \
    1543         src/globals/UIActionPoolManager.cpp \
    1544         src/globals/UIActionPoolRuntime.cpp \
    1545         src/globals/UIAnimationFramework.cpp \
    1546         src/globals/UICustomFileSystemModel.cpp \
    1547         src/globals/UIDefs.cpp \
    1548         src/globals/UIDesktopWidgetWatchdog.cpp \
    1549         src/globals/UIErrorString.cpp \
    1550         src/globals/UIIconPool.cpp \
    1551         src/globals/UIImageTools.cpp \
    1552         src/globals/UIMainEventListener.cpp \
    1553         src/globals/UIMessageCenter.cpp \
    1554         src/globals/UIModalWindowManager.cpp \
    1555         src/globals/UIPathOperations.cpp \
    1556         src/globals/UIPopupCenter.cpp \
    1557         src/globals/UIProgressEventHandler.cpp \
    1558         src/globals/UIShortcutPool.cpp \
    1559         src/globals/UIThreadPool.cpp \
    1560         src/globals/UIVersion.cpp \
    1561         src/globals/UIVirtualBoxEventHandler.cpp \
    1562         src/globals/VBoxGlobal.cpp \
    1563         src/logviewer/UIVMLogPage.cpp \
    1564         src/logviewer/UIVMLogViewerBookmarksPanel.cpp \
    1565         src/logviewer/UIVMLogViewerDialog.cpp \
    1566         src/logviewer/UIVMLogViewerFilterPanel.cpp \
    1567         src/logviewer/UIVMLogViewerOptionsPanel.cpp \
    1568         src/logviewer/UIVMLogViewerPanel.cpp \
    1569         src/logviewer/UIVMLogViewerSearchPanel.cpp \
    1570         src/logviewer/UIVMLogViewerTextEdit.cpp \
    1571         src/logviewer/UIVMLogViewerWidget.cpp \
    1572         src/medium/UIFDCreationDialog.cpp \
    1573         src/medium/UIMedium.cpp \
    1574         src/medium/UIMediumDefs.cpp \
    1575         src/medium/UIMediumEnumerator.cpp \
    1576         src/medium/UIMediumItem.cpp \
    1577         src/medium/UIMediumSelector.cpp \
    1578         src/medium/viso/UIVisoBrowserBase.cpp \
    1579         src/medium/viso/UIVisoContentBrowser.cpp \
    1580         src/medium/viso/UIVisoCreator.cpp \
    1581         src/medium/viso/UIVisoConfigurationDialog.cpp \
    1582         src/medium/viso/UIVisoCreatorOptionsDialog.cpp \
    1583         src/medium/viso/UIVisoHostBrowser.cpp \
    1584         src/objects/UIRichTextString.cpp \
    1585         src/runtime/UIConsoleEventHandler.cpp \
    1586         src/runtime/UIFrameBuffer.cpp \
    1587         src/runtime/UIIndicatorsPool.cpp \
    1588         src/runtime/UIKeyboardHandler.cpp \
    1589         src/runtime/UIMachine.cpp \
    1590         src/runtime/UIMachineLogic.cpp \
    1591         src/runtime/UIMachineView.cpp \
    1592         src/runtime/UIMachineWindow.cpp \
    1593         src/runtime/UIMouseHandler.cpp \
    1594         src/runtime/UIMultiScreenLayout.cpp \
    1595         src/runtime/UISession.cpp \
    1596         src/runtime/UIVMCloseDialog.cpp \
    1597         src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp \
    1598         src/runtime/fullscreen/UIMachineLogicFullscreen.cpp \
    1599         src/runtime/fullscreen/UIMachineViewFullscreen.cpp \
    1600         src/runtime/fullscreen/UIMachineWindowFullscreen.cpp \
    1601         src/runtime/information/UIInformationConfiguration.cpp \
    1602         src/runtime/information/UIInformationDataItem.cpp \
    1603         src/runtime/information/UIInformationItem.cpp \
    1604         src/runtime/information/UIInformationModel.cpp \
    1605         src/runtime/information/UIInformationRuntime.cpp \
    1606         src/runtime/information/UIInformationView.cpp \
    1607         src/runtime/information/UIVMInformationDialog.cpp \
    1608         src/guestctrl/UIGuestControlConsole.cpp \
    1609         src/guestctrl/UIFileManager.cpp \
    1610         src/guestctrl/UIFileManagerDialog.cpp \
    1611         src/guestctrl/UIFileManagerLogPanel.cpp \
    1612         src/guestctrl/UIFileManagerOperationsPanel.cpp \
    1613         src/guestctrl/UIFileManagerOptionsPanel.cpp \
    1614         src/guestctrl/UIFileManagerPanel.cpp \
    1615         src/guestctrl/UIFileManagerSessionPanel.cpp \
    1616         src/guestctrl/UIFileManagerTable.cpp \
    1617         src/guestctrl/UIGuestControlInterface.cpp \
    1618         src/guestctrl/UIGuestControlTreeItem.cpp \
    1619         src/guestctrl/UIFileManagerGuestTable.cpp \
    1620         src/guestctrl/UIGuestProcessControlDialog.cpp \
    1621         src/guestctrl/UIGuestProcessControlWidget.cpp \
    1622         src/guestctrl/UIFileManagerHostTable.cpp \
    1623         src/runtime/normal/UIKeyboardHandlerNormal.cpp \
    1624         src/runtime/normal/UIMachineLogicNormal.cpp \
    1625         src/runtime/normal/UIMachineViewNormal.cpp \
    1626         src/runtime/normal/UIMachineWindowNormal.cpp \
    1627         src/runtime/scale/UIKeyboardHandlerScale.cpp \
    1628         src/runtime/scale/UIMachineLogicScale.cpp \
    1629         src/runtime/scale/UIMachineViewScale.cpp \
    1630         src/runtime/scale/UIMachineWindowScale.cpp \
    1631         src/runtime/seamless/UIKeyboardHandlerSeamless.cpp \
    1632         src/runtime/seamless/UIMachineLogicSeamless.cpp \
    1633         src/runtime/seamless/UIMachineViewSeamless.cpp \
    1634         src/runtime/seamless/UIMachineWindowSeamless.cpp \
    1635         src/settings/UISettingsDefs.cpp \
    1636         src/settings/UISettingsDialog.cpp \
    1637         src/settings/UISettingsDialogSpecific.cpp \
    1638         src/settings/UISettingsPage.cpp \
    1639         src/settings/UISettingsSelector.cpp \
    1640         src/settings/UISettingsSerializer.cpp \
    1641         src/settings/global/UIGlobalSettingsExtension.cpp \
    1642         src/settings/global/UIGlobalSettingsGeneral.cpp \
    1643         src/settings/global/UIGlobalSettingsInput.cpp \
    1644         src/settings/global/UIGlobalSettingsLanguage.cpp \
    1645         src/settings/global/UIGlobalSettingsDisplay.cpp \
    1646         src/settings/global/UIGlobalSettingsNetwork.cpp \
    1647         src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp \
    1648         src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
    1649         src/settings/machine/UIMachineSettingsAudio.cpp \
    1650         src/settings/machine/UIMachineSettingsDisplay.cpp \
    1651         src/settings/machine/UIMachineSettingsGeneral.cpp \
    1652         src/settings/machine/UIMachineSettingsInterface.cpp \
    1653         src/settings/machine/UIMachineSettingsNetwork.cpp \
    1654         src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp \
    1655         src/settings/machine/UIMachineSettingsSF.cpp \
    1656         src/settings/machine/UIMachineSettingsSFDetails.cpp \
    1657         src/settings/machine/UIMachineSettingsSerial.cpp \
    1658         src/settings/machine/UIMachineSettingsStorage.cpp \
    1659         src/settings/machine/UIMachineSettingsSystem.cpp \
    1660         src/settings/machine/UIMachineSettingsUSB.cpp \
    1661         src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp \
    1662         src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    1663         src/widgets/UIBootTable.cpp \
    1664         src/widgets/UIFilePathSelector.cpp \
    1665         src/widgets/UIFilmContainer.cpp \
    1666         src/widgets/UIGuestRAMSlider.cpp \
    1667         src/widgets/UIHostComboEditor.cpp \
    1668         src/widgets/UIHotKeyEditor.cpp \
    1669         src/widgets/UIMediaComboBox.cpp \
    1670         src/widgets/UIMediumSizeEditor.cpp \
    1671         src/widgets/UIMenuBar.cpp \
    1672         src/widgets/UIMenuBarEditorWindow.cpp \
    1673         src/widgets/UIMiniToolBar.cpp \
    1674         src/widgets/UINameAndSystemEditor.cpp \
    1675         src/widgets/UIPopupBox.cpp \
    1676         src/widgets/UIPopupPane.cpp \
    1677         src/widgets/UIPopupPaneButtonPane.cpp \
    1678         src/widgets/UIPopupPaneMessage.cpp \
    1679         src/widgets/UIPopupPaneDetails.cpp \
    1680         src/widgets/UIPopupStack.cpp \
    1681         src/widgets/UIPopupStackViewport.cpp \
    1682         src/widgets/UIPortForwardingTable.cpp \
    1683         src/widgets/UIProgressDialog.cpp \
    1684         src/widgets/UIScaleFactorEditor.cpp \
    1685         src/widgets/UISlidingToolBar.cpp \
    1686         src/widgets/UISpecialControls.cpp \
    1687         src/widgets/UIStatusBarEditorWindow.cpp \
    1688         src/widgets/UIToolBar.cpp \
    1689         src/widgets/UIWarningPane.cpp \
    1690         src/wizards/UIWizard.cpp \
    1691         src/wizards/UIWizardPage.cpp \
    1692         src/wizards/firstrun/UIWizardFirstRun.cpp \
    1693         src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp \
    1694         src/wizards/newvd/UIWizardNewVD.cpp \
    1695         src/wizards/newvd/UIWizardNewVDPageBasic1.cpp \
    1696         src/wizards/newvd/UIWizardNewVDPageBasic2.cpp \
    1697         src/wizards/newvd/UIWizardNewVDPageBasic3.cpp \
    1698         src/wizards/newvd/UIWizardNewVDPageExpert.cpp
    1699 
    1700  ifdef VBOX_WITH_DRAG_AND_DROP
    1701   VirtualBox_SOURCES += \
    1702    src/runtime/UIDnDHandler.cpp
    1703   ifdef VBOX_WITH_DRAG_AND_DROP_GH
    1704    VirtualBox_SOURCES += \
    1705    src/runtime/UIDnDMIMEData.cpp
    1706    VirtualBox_SOURCES.win += \
    1707    src/runtime/UIDnDDropSource_win.cpp \
    1708    src/runtime/UIDnDDataObject_win.cpp \
    1709    src/runtime/UIDnDEnumFormat_win.cpp
    1710   endif
    1711  endif
    1712 
    1713  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    1714   VirtualBox_SOURCES += \
    1715         src/net/UIDownloader.cpp \
    1716         src/net/UIDownloaderAdditions.cpp \
    1717         src/net/UIDownloaderExtensionPack.cpp \
    1718         src/net/UIDownloaderUserManual.cpp \
    1719         src/net/UINetworkCustomer.cpp \
    1720         src/net/UINetworkManager.cpp \
    1721         src/net/UINetworkManagerDialog.cpp \
    1722         src/net/UINetworkManagerIndicator.cpp \
    1723         src/net/UINetworkRequest.cpp \
    1724         src/net/UINetworkRequestWidget.cpp \
    1725         src/net/UINetworkReply.cpp \
    1726         src/net/UIUpdateDefs.cpp \
    1727         src/net/UIUpdateManager.cpp \
    1728         src/settings/global/UIGlobalSettingsProxy.cpp \
    1729         src/settings/global/UIGlobalSettingsUpdate.cpp
    1730  endif
    1731 
    1732  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
    1733   VirtualBox_SOURCES += \
    1734         src/platform/x11/VBoxX11Helper.cpp \
    1735         src/platform/x11/XKeyboard-new.cpp
    1736  endif
    1737 
    1738  VirtualBox_SOURCES.win += \
    1739         src/platform/win/VBoxUtils-win.cpp \
    1740         src/platform/win/WinKeyboard.cpp
    1741 
    1742  VirtualBox_SOURCES.darwin += \
    1743         src/platform/darwin/CocoaEventHelper.mm \
    1744         src/platform/darwin/DarwinKeyboard.cpp \
    1745         src/platform/darwin/UIAbstractDockIconPreview.cpp \
    1746         src/platform/darwin/UICocoaApplication.mm \
    1747         src/platform/darwin/UICocoaDockIconPreview.mm \
    1748         src/platform/darwin/UICocoaSpecialControls.mm \
    1749         src/platform/darwin/UIWindowMenuManager.cpp \
    1750         src/platform/darwin/VBoxUtils-darwin-cocoa.mm \
    1751         src/platform/darwin/VBoxUtils-darwin.cpp
    1752 
    1753 endif # !VBOX_GUI_WITH_SHARED_LIBRARY
    1754 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    1755 
    1756  #
    1757  # VirtualBox Virtual Machine Application
    1758  # Sources.
    1759  #
    1760  VirtualBoxVM_SOURCES = \
     1129
     1130#
     1131# VirtualBox Virtual Machine Application
     1132# Sources.
     1133#
     1134VirtualBoxVM_SOURCES = \
    17611135        src/main.cpp \
    17621136        src/globals/UIStarter.cpp \
    … …  
    18151189        src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp
    18161190
    1817  ifdef VBOX_WITH_DRAG_AND_DROP
     1191ifdef VBOX_WITH_DRAG_AND_DROP
     1192 VirtualBoxVM_SOURCES += \
     1193        src/runtime/UIDnDHandler.cpp
     1194 ifdef VBOX_WITH_DRAG_AND_DROP_GH
    18181195  VirtualBoxVM_SOURCES += \
    1819         src/runtime/UIDnDHandler.cpp
    1820   ifdef VBOX_WITH_DRAG_AND_DROP_GH
    1821    VirtualBoxVM_SOURCES += \
    18221196        src/runtime/UIDnDMIMEData.cpp
    1823    VirtualBoxVM_SOURCES.win += \
     1197  VirtualBoxVM_SOURCES.win += \
    18241198        src/runtime/UIDnDDropSource_win.cpp \
    18251199        src/runtime/UIDnDDataObject_win.cpp \
    18261200        src/runtime/UIDnDEnumFormat_win.cpp
    1827   endif
    18281201 endif
    1829 
    1830  if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    1831   VirtualBoxVM_SOURCES += \
     1202endif
     1203
     1204if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
     1205 VirtualBoxVM_SOURCES += \
    18321206        src/VBox2DHelpers.cpp \
    18331207        src/VBoxFBOverlay.cpp \
    18341208        src/VBoxGLSupportInfo.cpp
    1835  endif
    1836 
    1837  VirtualBoxVM_SOURCES.darwin += \
     1209endif
     1210
     1211VirtualBoxVM_SOURCES.darwin += \
    18381212        src/platform/darwin/UIAbstractDockIconPreview.cpp \
    18391213        src/platform/darwin/UICocoaDockIconPreview.mm
    18401214
    1841  VirtualBoxVM_SOURCES.win += \
     1215VirtualBoxVM_SOURCES.win += \
    18421216        src/platform/win/VirtualBox.rc
    18431217
    18441218
    1845  #
    1846  # VirtualBox - GUI Global Shared Library.
    1847  # Sources.
    1848  #
    1849  VBoxGlobal_SOURCES = \
     1219#
     1220# VirtualBox - GUI Global Shared Library.
     1221# Sources.
     1222#
     1223VBoxGlobal_SOURCES = \
    18501224        src/VBoxAboutDlg.cpp \
    18511225        src/VBoxLicenseViewer.cpp \
    … …  
    19951369        src/wizards/newvd/UIWizardNewVDPageExpert.cpp
    19961370
    1997  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    1998   VBoxGlobal_SOURCES += \
     1371ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     1372 VBoxGlobal_SOURCES += \
    19991373        src/net/UIDownloader.cpp \
    20001374        src/net/UIDownloaderAdditions.cpp \
    … …  
    20121386        src/settings/global/UIGlobalSettingsProxy.cpp \
    20131387        src/settings/global/UIGlobalSettingsUpdate.cpp
    2014  endif
    2015 
    2016  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
    2017   VBoxGlobal_SOURCES += \
     1388endif
     1389
     1390if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
     1391 VBoxGlobal_SOURCES += \
    20181392        src/platform/x11/VBoxX11Helper.cpp \
    20191393        src/platform/x11/XKeyboard-new.cpp
    2020  endif
    2021 
    2022  VBoxGlobal_SOURCES.win += \
     1394endif
     1395
     1396VBoxGlobal_SOURCES.win += \
    20231397        src/platform/win/VBoxUtils-win.cpp \
    20241398        src/platform/win/WinKeyboard.cpp
    20251399
    2026  VBoxGlobal_SOURCES.darwin += \
     1400VBoxGlobal_SOURCES.darwin += \
    20271401        src/platform/darwin/CocoaEventHelper.mm \
    20281402        src/platform/darwin/DarwinKeyboard.cpp \
    … …  
    20331407        src/platform/darwin/VBoxUtils-darwin.cpp
    20341408
    2035  if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    2036   VBoxGlobal_SOURCES += \
     1409if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
     1410 VBoxGlobal_SOURCES += \
    20371411        src/VBox2DHelpers.cpp \
    20381412        src/VBoxGLSupportInfo.cpp
    2039  endif
    2040 
    2041 endif # VBOX_GUI_WITH_SHARED_LIBRARY
     1413endif
    20421414
    20431415
    … …  
    20761448
    20771449
    2078 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    2079 
    2080  #
    2081  # VirtualBox Virtual Machine Application
    2082  # The Qt modules we're using.
    2083  # (The include directory and lib/framework for each module will be added by the Qt unit.)
    2084  #
    2085  VirtualBoxVM_QT_MODULES = Core Gui Widgets PrintSupport
    2086  VirtualBoxVM_QT_MODULES.linux   += X11Extras
    2087  VirtualBoxVM_QT_MODULES.solaris += X11Extras
    2088  VirtualBoxVM_QT_MODULES.freebsd += X11Extras
    2089  VirtualBoxVM_QT_MODULES.darwin  += MacExtras
    2090  VirtualBoxVM_QT_MODULES.win     += WinExtras
    2091  if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    2092   VirtualBoxVM_QT_MODULES += OpenGL
    2093  endif
    2094 
    2095 
    2096  #
    2097  # VirtualBox - GUI Global Shared Library.
    2098  # The Qt modules we're using.
    2099  # (The include directory and lib/framework for each module will be added by the Qt unit.)
    2100  #
    2101  VBoxGlobal_QT_MODULES = Core Gui Widgets
    2102  VBoxGlobal_QT_MODULES.linux   += X11Extras
    2103  VBoxGlobal_QT_MODULES.solaris += X11Extras
    2104  VBoxGlobal_QT_MODULES.freebsd += X11Extras
    2105  VBoxGlobal_QT_MODULES.darwin  += MacExtras
    2106  VBoxGlobal_QT_MODULES.win     += WinExtras
    2107  if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    2108   VBoxGlobal_QT_MODULES += OpenGL
    2109  endif
    2110 
    2111 endif # VBOX_GUI_WITH_SHARED_LIBRARY
     1450#
     1451# VirtualBox Virtual Machine Application
     1452# The Qt modules we're using.
     1453# (The include directory and lib/framework for each module will be added by the Qt unit.)
     1454#
     1455VirtualBoxVM_QT_MODULES = Core Gui Widgets PrintSupport
     1456VirtualBoxVM_QT_MODULES.linux   += X11Extras
     1457VirtualBoxVM_QT_MODULES.solaris += X11Extras
     1458VirtualBoxVM_QT_MODULES.freebsd += X11Extras
     1459VirtualBoxVM_QT_MODULES.darwin  += MacExtras
     1460VirtualBoxVM_QT_MODULES.win     += WinExtras
     1461if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
     1462 VirtualBoxVM_QT_MODULES += OpenGL
     1463endif
     1464
     1465
     1466#
     1467# VirtualBox - GUI Global Shared Library.
     1468# The Qt modules we're using.
     1469# (The include directory and lib/framework for each module will be added by the Qt unit.)
     1470#
     1471VBoxGlobal_QT_MODULES = Core Gui Widgets
     1472VBoxGlobal_QT_MODULES.linux   += X11Extras
     1473VBoxGlobal_QT_MODULES.solaris += X11Extras
     1474VBoxGlobal_QT_MODULES.freebsd += X11Extras
     1475VBoxGlobal_QT_MODULES.darwin  += MacExtras
     1476VBoxGlobal_QT_MODULES.win     += WinExtras
     1477if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
     1478 VBoxGlobal_QT_MODULES += OpenGL
     1479endif
    21121480
    21131481
    21141482# Pull in the ui files
    21151483$(eval VirtualBox_SOURCES += $(FORMS))
    2116 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    2117  $(eval VirtualBoxVM_SOURCES += $(FORMS))
    2118  $(eval VBoxGlobal_SOURCES += $(FORMS))
    2119 endif
     1484$(eval VirtualBoxVM_SOURCES += $(FORMS))
     1485$(eval VBoxGlobal_SOURCES += $(FORMS))
    21201486
    21211487
    … …  
    21451511
    21461512
    2147 ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    2148  # Resource files with some OSE differences (VirtualBoxBrand.qrc is created further down).
    2149  VirtualBoxVM_SOURCES            += VirtualBox1.qrc
    2150  VirtualBox1.qrc_RCCFLAGS       = -name BASIC1
    2151  VirtualBoxVM_SOURCES            += VirtualBox2.qrc
    2152  VirtualBox2.qrc_RCCFLAGS       = -name BASIC2
    2153  VirtualBoxVM_SOURCES             += VirtualBox1_x2.qrc
    2154  VirtualBox1_x2.qrc_RCCFLAGS  = -name BASIC1_X2
    2155  VirtualBoxVM_SOURCES             += VirtualBox2_x2.qrc
    2156  VirtualBox2_x2.qrc_RCCFLAGS  = -name BASIC2_X2
    2157  VirtualBoxVM_SOURCES             += VirtualBox1_x3.qrc
    2158  VirtualBox1_x3.qrc_RCCFLAGS  = -name BASIC1_X3
    2159  VirtualBoxVM_SOURCES             += VirtualBox2_x3.qrc
    2160  VirtualBox2_x3.qrc_RCCFLAGS  = -name BASIC2_X3
    2161  VirtualBoxVM_SOURCES             += VirtualBox1_x4.qrc
    2162  VirtualBox1_x4.qrc_RCCFLAGS  = -name BASIC1_X4
    2163  VirtualBoxVM_SOURCES             += VirtualBox2_x4.qrc
    2164  VirtualBox2_x4.qrc_RCCFLAGS  = -name BASIC2_X4
    2165  VirtualBoxVM_SOURCES += $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc
    2166  $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND
    2167  if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    2168   VirtualBoxVM_SOURCES += VirtualBoxShaders.qrc
    2169   VirtualBoxShaders.qrc_RCCFLAGS = -name SHADERS
    2170  endif
     1513# Resource files with some OSE differences (VirtualBoxBrand.qrc is created further down).
     1514VirtualBoxVM_SOURCES            += VirtualBox1.qrc
     1515VirtualBox1.qrc_RCCFLAGS       = -name BASIC1
     1516VirtualBoxVM_SOURCES            += VirtualBox2.qrc
     1517VirtualBox2.qrc_RCCFLAGS       = -name BASIC2
     1518VirtualBoxVM_SOURCES             += VirtualBox1_x2.qrc
     1519VirtualBox1_x2.qrc_RCCFLAGS  = -name BASIC1_X2
     1520VirtualBoxVM_SOURCES             += VirtualBox2_x2.qrc
     1521VirtualBox2_x2.qrc_RCCFLAGS  = -name BASIC2_X2
     1522VirtualBoxVM_SOURCES             += VirtualBox1_x3.qrc
     1523VirtualBox1_x3.qrc_RCCFLAGS  = -name BASIC1_X3
     1524VirtualBoxVM_SOURCES             += VirtualBox2_x3.qrc
     1525VirtualBox2_x3.qrc_RCCFLAGS  = -name BASIC2_X3
     1526VirtualBoxVM_SOURCES             += VirtualBox1_x4.qrc
     1527VirtualBox1_x4.qrc_RCCFLAGS  = -name BASIC1_X4
     1528VirtualBoxVM_SOURCES             += VirtualBox2_x4.qrc
     1529VirtualBox2_x4.qrc_RCCFLAGS  = -name BASIC2_X4
     1530VirtualBoxVM_SOURCES += $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc
     1531$(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND
     1532if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
     1533 VirtualBoxVM_SOURCES += VirtualBoxShaders.qrc
     1534 VirtualBoxShaders.qrc_RCCFLAGS = -name SHADERS
    21711535endif
    21721536
    … …  
    21801544VirtualBox_QT_TRANSLATIONS_INST = $(INST_BIN)nls/
    21811545# All files which contain translatable strings.
    2182 VirtualBox_VBOX_ALL_NLS_SOURCES = $(VirtualBox_SOURCES) \
    2183         $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),$(VirtualBoxVM_SOURCES) $(VBoxGlobal_SOURCES))
     1546VirtualBox_VBOX_ALL_NLS_SOURCES = $(VirtualBox_SOURCES) $(VirtualBoxVM_SOURCES) $(VBoxGlobal_SOURCES)
    21841547
    21851548
    … …  
    21951558#
    21961559# Build generated COM wrappers as part of app.
    2197 #
    2198 ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    2199 
    2200  #
    2201  # VirtualBox Manager Application
    2202  #
    2203  includedep $(PATH_TARGET)/VirtualBoxComWrapperFiles.dep
    2204  VirtualBox_BLDDIRS       += $(VirtualBox_0_OUTDIR)/include
    2205  VirtualBox_INTERMEDIATES += $(VirtualBox_0_OUTDIR)/include/COMWrappers
    2206  VirtualBox_SOURCES       += $(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp
    2207  VirtualBox_CLEAN         += $(wildcard $(VirtualBox_0_OUTDIR)/include/*) $(PATH_TARGET)/VirtualBoxComWrapperFiles.dep
    2208 
    2209  ## @todo kmk doesn't remake optional outputs when they are missing...
    2210  $$(VirtualBox_0_OUTDIR)/include/COMWrappers \
    2211  + $(PATH_TARGET)/VirtualBoxComWrapperFiles.dep \
    2212  +| $(if-expr defined(VirtualBox_VBOX_COMWRAPPERS) \
    2213  , $(VirtualBox_VBOX_COMWRAPPERS) \
    2214  , $$(VirtualBox_0_OUTDIR)/include/COMEnums.h \
    2215    $$(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp \
    2216  ): \
    2217                 $(VBOX_XIDL_FILE) \
    2218                 $(VBOX_VIRTUALBOX_SRC)/src/globals/COMWrappers.xsl \
    2219                 $(VBOX_FILESPLIT) \
    2220                 | $$(dir $$@)
    2221         $(call MSG_GENERATE,VirtualBox,$<,$@)
    2222         $(QUIET)$(RM) -f -- "$@" "$(PATH_TARGET)/VirtualBoxComWrapperFiles.dep"
    2223         $(QUIET)$(VBOX_XSLTPROC) -o $@ \
    2224                 $(VBOX_VIRTUALBOX_SRC)/src/globals/COMWrappers.xsl $<
    2225         $(QUIET)$(VBOX_FILESPLIT) $@ $(VirtualBox_0_OUTDIR)/include \
    2226                 $(PATH_TARGET)/VirtualBoxComWrapperFiles.dep VirtualBox_VBOX_COMWRAPPERS
    2227         $(APPEND) "$@"
    2228 
    2229  # alias for generating the COM Wrappers file.
    2230  testwrappers:: $$(VirtualBox_0_OUTDIR)/include/COMWrappers
    2231 
    2232 else # VBOX_GUI_WITH_SHARED_LIBRARY
    2233 
    2234  #
    2235  # VirtualBox - GUI Global Shared Library.
    2236  #
    2237  includedep $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep
    2238  VBoxGlobal_BLDDIRS       += $(VBoxGlobal_0_OUTDIR)/include
    2239  VBoxGlobal_INTERMEDIATES += $(VBoxGlobal_0_OUTDIR)/include/COMWrappers
    2240  VBoxGlobal_SOURCES       += $(VBoxGlobal_0_OUTDIR)/include/COMWrappers.cpp
    2241  VBoxGlobal_CLEAN         += $(wildcard $(VBoxGlobal_0_OUTDIR)/include/*) $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep
    2242 
    2243  ## @todo kmk doesn't remake optional outputs when they are missing...
    2244  $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers \
    2245  + $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep \
    2246  +| $(if-expr defined(VBoxGlobal_VBOX_COMWRAPPERS) \
    2247  , $(VBoxGlobal_VBOX_COMWRAPPERS) \
    2248  , $$(VBoxGlobal_0_OUTDIR)/include/COMEnums.h \
    2249    $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers.cpp \
    2250  ): \
     1560# VirtualBox - GUI Global Shared Library.
     1561#
     1562includedep $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep
     1563VBoxGlobal_BLDDIRS       += $(VBoxGlobal_0_OUTDIR)/include
     1564VBoxGlobal_INTERMEDIATES += $(VBoxGlobal_0_OUTDIR)/include/COMWrappers
     1565VBoxGlobal_SOURCES       += $(VBoxGlobal_0_OUTDIR)/include/COMWrappers.cpp
     1566VBoxGlobal_CLEAN         += $(wildcard $(VBoxGlobal_0_OUTDIR)/include/*) $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep
     1567
     1568## @todo kmk doesn't remake optional outputs when they are missing...
     1569$$(VBoxGlobal_0_OUTDIR)/include/COMWrappers \
     1570+ $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep \
     1571+| $(if-expr defined(VBoxGlobal_VBOX_COMWRAPPERS) \
     1572, $(VBoxGlobal_VBOX_COMWRAPPERS) \
     1573, $$(VBoxGlobal_0_OUTDIR)/include/COMEnums.h \
     1574  $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers.cpp \
     1575): \
    22511576                $(VBOX_XIDL_FILE) \
    22521577                $(VBOX_VIRTUALBOX_SRC)/src/globals/COMWrappers.xsl \
    … …  
    22611586        $(APPEND) "$@"
    22621587
    2263  # alias for generating the COM Wrappers file.
    2264  testwrappers:: $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers
    2265 
    2266 endif # VBOX_GUI_WITH_SHARED_LIBRARY
     1588# alias for generating the COM Wrappers file.
     1589testwrappers:: $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers
    22671590
    22681591
    … …  
    25031826 tstDarwinKeyboard_LIBS = \
    25041827        $(LIB_RUNTIME)
    2505  ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    2506   tstDarwinKeyboard_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)
    2507  endif
     1828 tstDarwinKeyboard_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)
    25081829endif
    25091830

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/QIWithRetranslateUI.h

    r76581 r76818  
    6767};
    6868
    69 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    7069/** Explicit QIWithRetranslateUI instantiation for QWidget class.
    7170  * @note  On Windows it's important that all template cases are instantiated just once across
    … …  
    7675  *        to library because latter can have lack of required instantiations (current case). */
    7776template class SHARED_LIBRARY_STUFF QIWithRetranslateUI<QWidget>;
    78 #endif
    7977
    8078

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UILibraryDefs.h

    r76581 r76818  
    2626
    2727/* Define shared library stuff: */
    28 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    29 # ifdef VBOX_GUI_LIBRARY
    30 #  define SHARED_LIBRARY_STUFF DECLEXPORT_CLASS
    31 # else
    32 #  define SHARED_LIBRARY_STUFF DECLIMPORT_CLASS
    33 # endif
     28#ifdef VBOX_GUI_LIBRARY
     29# define SHARED_LIBRARY_STUFF DECLEXPORT_CLASS
    3430#else
    35 # define SHARED_LIBRARY_STUFF
     31# define SHARED_LIBRARY_STUFF DECLIMPORT_CLASS
    3632#endif
    3733
    3834#endif /* !FEQT_INCLUDED_SRC_globals_UILibraryDefs_h */
    39 

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIStarter.cpp

    r76553 r76818  
    2424#include "UIMessageCenter.h"
    2525#include "UIStarter.h"
    26 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
     26#ifndef VBOX_RUNTIME_UI
    2727# include "UIVirtualBoxManager.h"
    28 #endif
    29 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
     28#else
    3029# include "UIMachine.h"
    3130# include "UISession.h"
    32 # endif
     31#endif
    3332
    3433
    … …  
    111110        return;
    112111
    113 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
     112#ifndef VBOX_RUNTIME_UI
     113
    114114    /* Show Selector UI: */
    115115    if (!vboxGlobal().isVMConsoleProcess())
    … …  
    138138# endif /* !VBOX_BLEEDING_EDGE */
    139139    }
    140 #endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || !VBOX_RUNTIME_UI */
    141 
    142 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
     140
     141#else /* VBOX_RUNTIME_UI */
     142
    143143    /* Show Runtime UI: */
    144144    if (vboxGlobal().isVMConsoleProcess())
    … …  
    148148            return QApplication::quit();
    149149    }
    150 # if defined(VBOX_GUI_WITH_SHARED_LIBRARY) && defined(VBOX_RUNTIME_UI)
    151150    /* Show the error message otherwise and quit: */
    152151    else
    … …  
    155154        return QApplication::quit();
    156155    }
    157 # endif /* VBOX_GUI_WITH_SHARED_LIBRARY && VBOX_RUNTIME_UI */
    158 #endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || VBOX_RUNTIME_UI */
     156
     157#endif /* VBOX_RUNTIME_UI */
    159158}
    160159
    161160void UIStarter::sltRestartUI()
    162161{
    163 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
     162#ifndef VBOX_RUNTIME_UI
    164163    /* Recreate/show manager-window: */
    165164    UIVirtualBoxManager::destroy();
    166165    UIVirtualBoxManager::create();
    167 #endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || !VBOX_RUNTIME_UI */
     166#endif
    168167}
    169168
    170169void UIStarter::cleanup()
    171170{
    172 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
     171#ifndef VBOX_RUNTIME_UI
    173172    /* Destroy Manager UI: */
    174173    if (gpManager)
    175174        UIVirtualBoxManager::destroy();
    176 #endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || !VBOX_RUNTIME_UI */
    177 
    178 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
     175#else
    179176    /* Destroy Runtime UI: */
    180177    if (gpMachine)
    181178        UIMachine::destroy();
    182 #endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || VBOX_RUNTIME_UI */
     179#endif
    183180}
    184181
    185182void UIStarter::sltOpenURLs()
    186183{
    187 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
     184#ifndef VBOX_RUNTIME_UI
    188185    /* Create/show manager-window: */
    189186    UIVirtualBoxManager::create();
    … …  
    191188    /* Ask the Manager UI to open URLs asynchronously: */
    192189    QMetaObject::invokeMethod(gpManager, "sltHandleOpenUrlCall", Qt::QueuedConnection);
    193 #endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || !VBOX_RUNTIME_UI */
     190#endif
    194191}
    195192
    … …  
    200197        return;
    201198
    202 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
     199#ifdef VBOX_RUNTIME_UI
    203200    /* For VM process: */
    204201    if (vboxGlobal().isVMConsoleProcess())
    … …  
    208205            gpMachine->uisession()->setDefaultCloseAction(MachineCloseAction_SaveState);
    209206    }
    210 #endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || VBOX_RUNTIME_UI */
    211 }
     207#endif
     208}

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

    r76768 r76818  
    236236
    237237/* static */
    238 #ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    239 void VBoxGlobal::create()
    240 #else
    241238void VBoxGlobal::create(UIType enmType)
    242 #endif
    243239{
    244240    /* Make sure instance is NOT created yet: */
    … …  
    249245    }
    250246
    251 #ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    252     /* Create instance: */
    253     new VBoxGlobal;
    254 #else
    255247    /* Create instance: */
    256248    new VBoxGlobal(enmType);
    257 #endif
    258249    /* Prepare instance: */
    259250    s_pInstance->prepare();
    … …  
    280271}
    281272
    282 #ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    283 VBoxGlobal::VBoxGlobal()
    284     : m_fValid(false)
    285 #else
    286273VBoxGlobal::VBoxGlobal(UIType enmType)
    287274    : m_enmType(enmType)
    288275    , m_fValid(false)
    289 #endif
    290276#ifdef VBOX_WS_MAC
    291277    , m_enmMacOSVersion(MacOSXRelease_Old)
    … …  
    41104096            msgCenter().warnAboutUnknownOptionType(arguments.at(i));
    41114097#endif
    4112 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    41134098        if (enmOptType == OptType_VMRunner && m_enmType != UIType_RuntimeUI)
    41144099            msgCenter().warnAboutUnrelatedOptionType(arg);
    4115 #endif
    41164100
    41174101        i++;
    41184102    }
    41194103
    4120 #ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    4121     if (startVM)
    4122 #else
    41234104    if (m_enmType == UIType_RuntimeUI && startVM)
    4124 #endif
    41254105    {
    41264106        /* m_fSeparateProcess makes sense only if a VM is started. */

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

    r76740 r76818  
    108108public:
    109109
    110 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    111110    /** UI types. */
    112111    enum UIType
    … …  
    115114        UIType_RuntimeUI
    116115    };
    117 #endif
    118116
    119117    /** VM launch modes. */
    … …  
    136134    /** Returns VBoxGlobal instance. */
    137135    static VBoxGlobal *instance() { return s_pInstance; }
    138 #ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    139     /** Creates VBoxGlobal instance. */
    140     static void create();
    141 #else
    142136    /** Creates VBoxGlobal instance of passed @a enmType. */
    143137    static void create(UIType enmType);
    144 #endif
    145138    /** Destroys VBoxGlobal instance. */
    146139    static void destroy();
    … …  
    170163        bool isValid() const { return m_fValid; }
    171164
    172 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    173165        /** Returns the UI type. */
    174166        UIType uiType() const { return m_enmType; }
    175 #endif
    176167
    177168        /** Returns VBox version string. */
    … …  
    686677private:
    687678
    688 #ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    689     /** Construcs global VirtualBox object. */
    690     VBoxGlobal();
    691 #else
    692679    /** Construcs global VirtualBox object of passed @a enmType. */
    693680    VBoxGlobal(UIType enmType);
    694 #endif
    695681
    696682    /** Destrucs global VirtualBox object. */
    … …  
    745731        static QString  s_strUserDefinedPortName;
    746732
    747 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    748733        /** Holds the UI type. */
    749734        UIType  m_enmType;
    750 #endif
    751735
    752736        /** Holds whether VBoxGlobal instance is properly initialized. */
    … …  
    894878    /** @} */
    895879
    896 #if defined(VBOX_WS_WIN) && defined(VBOX_GUI_WITH_SHARED_LIBRARY)
     880#if defined(VBOX_WS_WIN)
    897881    /** @name ATL stuff.
    898882     * @{ */

  • trunk/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp

    r76553 r76818  
    6565    uint32_t fFlags = (fStartVM && !fSeparateProcess) ? 0 : SUPSECMAIN_FLAGS_DONT_OPEN_DEV;
    6666
    67 #ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    68 # ifdef VBOX_RUNTIME_UI
    69     return SUPR3HardenedMain("VirtualBoxVM",
    70                              fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR | SUPSECMAIN_FLAGS_OSX_VM_APP,
    71                              argc, argv, envp);
    72 # else
    73     return SUPR3HardenedMain("VirtualBox",
    74                              fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR,
    75                              argc, argv, envp);
    76 # endif
    77 #else
    7867    return SUPR3HardenedMain("VirtualBoxVM",
    7968                             fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR,
    8069                             argc, argv, envp);
    81 #endif
    8270}
    8371

  • trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

    r76606 r76818  
    4242# include <VBox/sup.h>
    4343#endif
    44 #if !defined(VBOX_WITH_HARDENING) || defined(VBOX_GUI_WITH_SHARED_LIBRARY) && !defined(VBOX_RUNTIME_UI)
     44#if !defined(VBOX_WITH_HARDENING) || !defined(VBOX_RUNTIME_UI)
    4545# include <iprt/initterm.h>
    4646# ifdef VBOX_WS_MAC
    … …  
    260260static void ShowHelp()
    261261{
    262 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
     262#ifndef VBOX_RUNTIME_UI
    263263    static const char s_szTitle[] = VBOX_PRODUCT " VM Selector";
    264264#else
    … …  
    266266#endif
    267267    static const char s_szUsage[] =
    268 #if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
     268#ifdef VBOX_RUNTIME_UI
    269269        "Options:\n"
    270270        "  --startvm <vmname|UUID>    start a VM by specifying its UUID or name\n"
    … …  
    526526        /* Create UI starter: */
    527527        UIStarter::create();
    528 #ifndef VBOX_GUI_WITH_SHARED_LIBRARY
    529         /* Create global app instance: */
    530         VBoxGlobal::create();
    531 #else
    532 # ifndef VBOX_RUNTIME_UI
     528#ifndef VBOX_RUNTIME_UI
    533529        /* Create global app instance for Selector UI: */
    534530        VBoxGlobal::create(VBoxGlobal::UIType_SelectorUI);
    535 # else
     531#else
    536532        /* Create global app instance for Runtime UI: */
    537533        VBoxGlobal::create(VBoxGlobal::UIType_RuntimeUI);
    538 # endif
    539534#endif
    540535
    … …  
    593588}
    594589
    595 #if !defined(VBOX_WITH_HARDENING) || (defined(VBOX_GUI_WITH_SHARED_LIBRARY) && !defined(VBOX_RUNTIME_UI))
     590#if !defined(VBOX_WITH_HARDENING) || !defined(VBOX_RUNTIME_UI)
    596591
    597592int main(int argc, char **argv, char **envp)
    … …  
    604599
    605600    /* Initialize VBox Runtime: */
    606 # if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
     601# ifdef VBOX_RUNTIME_UI
    607602    /* Initialize the SUPLib as well only if we are really about to start a VM.
    608603     * Don't do this if we are only starting the selector window or a separate VM process. */
    … …  
    623618
    624619    uint32_t fFlags = fStartVM && !fSeparateProcess ? RTR3INIT_FLAGS_SUPLIB : 0;
    625 #else
     620# else
    626621    uint32_t fFlags = 0;
    627 #endif
     622# endif
    628623    int rc = RTR3InitExe(argc, &argv, fFlags);
    629624
    … …  
    687682}
    688683
    689 #endif /* !VBOX_WITH_HARDENING || (VBOX_GUI_WITH_SHARED_LIBRARY && !VBOX_RUNTIME_UI) */
     684#endif /* !VBOX_WITH_HARDENING || !VBOX_RUNTIME_UI */
    690685
    691686#ifdef VBOX_WITH_HARDENING

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/UIDesktopServices.h

    r76622 r76818  
    2525#include <QUuid>
    2626
    27 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    2827/** Name of the executable (image) used to start VMs. */
    29 # define VBOX_GUI_VMRUNNER_IMAGE "VirtualBoxVM"
    30 #endif
     28#define VBOX_GUI_VMRUNNER_IMAGE "VirtualBoxVM"
    3129
    3230/* Qt forward declarations */

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp

    r76731 r76818  
    3232    IShellLink *pShl = NULL;
    3333    IPersistFile *pPPF = NULL;
    34 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    3534    const QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/" + VBOX_GUI_VMRUNNER_IMAGE);
    36 #else
    37     const QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
    38 #endif
    3935    QFileInfo fi(strVBox);
    4036    QString strVBoxDir = QDir::toNativeSeparators(fi.absolutePath());

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp

    r76731 r76818  
    3333    if (link.open(QFile::WriteOnly | QFile::Truncate))
    3434    {
    35 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
    3635        const QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/" + VBOX_GUI_VMRUNNER_IMAGE);
    37 #else
    38         const QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
    39 #endif
    4036        QTextStream out(&link);
    4137        out.setCodec("UTF-8");
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette