Changeset 76818 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jan 14, 2019 4:17:07 PM (6 years ago)

Author:

vboxsync

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

128164

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/HostDrivers/Support

Files:

• Makefile.kmk (modified) (3 diffs)
• SUPR3HardenedVerify.cpp (modified) (1 diff)
• win/SUPHardenedVerifyProcess-win.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -154 +154 @@
         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \
         $(if $(VBOX_WITH_REM),VBOX_WITH_REM,) \
-        $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \
         VBOX_PERMIT_MORE \
         VBOX_PERMIT_EVEN_MORE
@@ -200 +199 @@
         $(if $(VBOX_WITHOUT_DEBUGGER_CHECKS),VBOX_WITHOUT_DEBUGGER_CHECKS,) \
         $(if $(VBOX_PERMIT_VISUAL_STUDIO_PROFILING),VBOX_PERMIT_VISUAL_STUDIO_PROFILING,) \
-        $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \
         VBOX_PERMIT_MORE \
         VBOX_PERMIT_EVEN_MORE
@@ -643 +641 @@
   VBoxDrv_DEFS           += VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV IPRT_WITH_EFLAGS_AC_PRESERVING
  endif
- ifdef VBOX_GUI_WITH_SHARED_LIBRARY
-  VBoxDrv_DEFS           += VBOX_GUI_WITH_SHARED_LIBRARY
- endif
 
  VBoxDrv_INCS             = . $(VBoxDrv_0_OUTDIR)

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

@@ -198 +198 @@
 //#ifdef VBOX_WITH_QTGUI
     {   kSupIFT_Exe,  kSupID_AppBin,             true, "VirtualBox" SUPLIB_EXE_SUFF },
-# ifndef VBOX_GUI_WITH_SHARED_LIBRARY
-    {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VirtualBox" SUPLIB_DLL_SUFF },
-#  ifdef RT_OS_DARWIN
-    {   kSupIFT_Exe,  kSupID_AppBin,             true, "VirtualBoxVM" SUPLIB_EXE_SUFF },
-#  endif
-# else
     {   kSupIFT_Exe,  kSupID_AppBin,             true, "VirtualBoxVM" SUPLIB_EXE_SUFF },
     {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VirtualBoxVM" SUPLIB_DLL_SUFF },
     {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VBoxGlobal" SUPLIB_DLL_SUFF },
-# endif
 # if !defined(RT_OS_DARWIN) && !defined(RT_OS_WINDOWS) && !defined(RT_OS_OS2)
     {   kSupIFT_Dll,  kSupID_AppSharedLib,       true, "VBoxKeyboard" SUPLIB_DLL_SUFF },

trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp

@@ -214 +214 @@
 {
     "VBoxHeadless.exe",
-#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
-    "VirtualBox.exe",
-#else
     "VirtualBoxVM.exe",
-#endif
     "VBoxSDL.exe",
     "VBoxNetDHCP.exe",