Changeset 80360 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Aug 21, 2019 8:41:18 AM (5 years ago)

Author:

vboxsync

Message:

HostServices/SharedOpenGL: Remove most of the chromium related HGCM service bits leaving only the renderspu and OpenGLTest app for now as they are used for VMSVGA as well (OpenGLTest needs to be rewritten), bugref:9529

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxMergeApp.wxi (modified) (3 diffs)
• VirtualBox.wxs (modified) (1 diff)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -608 +608 @@
                 -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \
                 -E 'VBOX_WITH_COMBINED_PACKAGE=$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \
-                -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),yes,no)' \
                 -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
@@ -754 +753 @@
                 -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \
                 -E 'VBOX_WITH_COMBINED_PACKAGE=$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \
-                -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),yes,no)' \
                 -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -317 +317 @@
               Source="$(env.PATH_OUT)\bin\VBoxDDR0.r0" />
 
-<?if $(env.VBOX_WITH_CROGL) = "yes" ?>
-        <File Id="file_VBoxTestOGL.exe" Name="VBoxTestOGL.exe"
-              Source="$(env.PATH_OUT)\bin\VBoxTestOGL.exe" />
-<?endif ?>
 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
         <!-- Qt frontend -->
@@ -347 +343 @@
         <File Id="file_Qt5WinExtras$(var.VBOX_QT_INFIX).dll" Name="Qt5WinExtras$(var.VBOX_QT_INFIX).dll"
               Source="$(env.PATH_OUT)\bin\Qt5WinExtras$(var.VBOX_QT_INFIX).dll" />
+
+        <File Id="file_VBoxTestOGL.exe" Name="VBoxTestOGL.exe"
+            Source="$(env.PATH_OUT)\bin\VBoxTestOGL.exe" />
 <?endif ?>
 <?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>
@@ -411 +410 @@
 <?endif ?>
 
-<?if $(env.VBOX_WITH_CROGL) = "yes" ?>
-    <Component Id="cp_VBoxCROpenGL" Guid="874A1297-835A-491D-8A9D-7E723BC29EE7" Win64="$(var.Property_Win64)">
-        <File Id="file_VBoxSharedCrOpenGL.dll" Name="VBoxSharedCrOpenGL.dll"
-              Source="$(env.PATH_OUT)\bin\VBoxSharedCrOpenGL.dll" />
-    </Component>
-<?endif?>
     <!-- SDL plugins -->
     <Component Id="cp_VBoxSDLBinaries" Guid="F09D5FD9-E176-42B0-90A9-481BB18B0CB4"

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -446 +446 @@
     <?endif ?>
 
-    <?if $(env.VBOX_WITH_CROGL) = "yes" ?>
-        <ComponentRef Id="cp_VBoxCROpenGL" />
-    <?endif ?>
     <ComponentRef Id="cp_VBoxSDLBinaries" />
     <?if $(env.VBOX_WITH_WEBSERVICES) = "yes" ?>