Changeset 80360 in vbox for trunk/src/VBox/Installer
- Timestamp:
- Aug 21, 2019 8:41:18 AM (6 years ago)
- svn:sync-xref-src-repo-rev:
- 132825
- Location:
- trunk/src/VBox/Installer
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/darwin/Makefile.kmk
r79365 r80360 388 388 VBOX_DI_VBAPP_DYLIBS += \ 389 389 MacOS/VBoxVRDP.dylib 390 endif391 ifdef VBOX_WITH_CROGL392 VBOX_DI_VBAPP_DYLIBS += \393 MacOS/VBoxSharedCrOpenGL.dylib394 390 endif 395 391 ifdef VBOX_WITH_DEBUGGER_GUI -
trunk/src/VBox/Installer/freebsd/Makefile.kmk
r78408 r80360 104 104 components/VBoxSVCM.so \ 105 105 components/VBoxC.so,) \ 106 $(if $(VBOX_WITH_CROGL),\107 106 VBoxTestOGL \ 108 VBoxSharedCrOpenGL.so,) \109 107 $(if $(VBOX_WITH_PYTHON),VBoxPython.so,) \ 110 108 $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) -
trunk/src/VBox/Installer/linux/Makefile.kmk
r79365 r80360 167 167 components/VBoxSVCM.so \ 168 168 components/VBoxC.so,) \ 169 $(if $(VBOX_WITH_CROGL),\ 170 $(if $(VBOX_WITH_QTGUI),VBoxTestOGL,) \ 171 VBoxSharedCrOpenGL.so,) \ 169 $(if $(VBOX_WITH_QTGUI),VBoxTestOGL,) \ 172 170 $(if $(VBOX_WITH_VMSVGA3D),VBoxSVGA3D.so,) \ 173 171 $(if $(VBOX_WITH_PYTHON),$(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*.so)),) \ -
trunk/src/VBox/Installer/linux/debian/lintian-override.in
r76972 r80360 22 22 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so 23 23 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxHeadless.so 24 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLhostcrutil.so25 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLhosterrorspu.so26 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLrenderspu.so27 24 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxPython.so 28 25 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM32.so 29 26 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM64.so 30 27 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSDL.so 31 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedCrOpenGL.so32 28 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VirtualBox.so 33 29 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDbg.so … … 85 81 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxKeyboard.so /usr/lib/virtualbox 86 82 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxManage /usr/lib/virtualbox 87 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxOGLhostcrutil.so /usr/lib/virtualbox88 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxOGLhosterrorspu.so /usr/lib/virtualbox89 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxOGLrenderspu.so /usr/lib/virtualbox90 83 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxPython.so /usr/lib/virtualbox 91 84 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxREM.so /usr/lib/virtualbox … … 98 91 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSettings.so /usr/lib/virtualbox 99 92 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSharedClipboard.so /usr/lib/virtualbox 100 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSharedCrOpenGL.so /usr/lib/virtualbox101 93 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSharedFolders.so /usr/lib/virtualbox 102 94 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDragAndDropSvc.so /usr/lib/virtualbox -
trunk/src/VBox/Installer/solaris/Makefile.kmk
r79989 r80360 302 302 $(if $(VBOX_WITH_EXTPACK),VBoxExtPackHelperApp,) \ 303 303 VBoxSVC \ 304 $(if $(VBOX_WITH_CROGL),VBoxTestOGL,)\304 VBoxTestOGL \ 305 305 VBoxXPCOMIPCD \ 306 306 $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,) \ … … 335 335 VBoxKeyboard.so) \ 336 336 $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so,) \ 337 $(if $(VBOX_WITH_CROGL),\338 VBoxSharedCrOpenGL.so) \339 337 components/VBoxC.so \ 340 338 components/VBoxSVCM.so \ -
trunk/src/VBox/Installer/win/Makefile.kmk
r80208 r80360 608 608 -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \ 609 609 -E 'VBOX_WITH_COMBINED_PACKAGE=$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \ 610 -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),yes,no)' \611 610 -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \ 612 611 -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)' \ 755 754 -E 'VBOX_WITH_COMBINED_PACKAGE=$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \ 756 -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),yes,no)' \757 755 -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \ 758 756 -E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \ -
trunk/src/VBox/Installer/win/VBoxMergeApp.wxi
r80208 r80360 317 317 Source="$(env.PATH_OUT)\bin\VBoxDDR0.r0" /> 318 318 319 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>320 <File Id="file_VBoxTestOGL.exe" Name="VBoxTestOGL.exe"321 Source="$(env.PATH_OUT)\bin\VBoxTestOGL.exe" />322 <?endif ?>323 319 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?> 324 320 <!-- Qt frontend --> … … 347 343 <File Id="file_Qt5WinExtras$(var.VBOX_QT_INFIX).dll" Name="Qt5WinExtras$(var.VBOX_QT_INFIX).dll" 348 344 Source="$(env.PATH_OUT)\bin\Qt5WinExtras$(var.VBOX_QT_INFIX).dll" /> 345 346 <File Id="file_VBoxTestOGL.exe" Name="VBoxTestOGL.exe" 347 Source="$(env.PATH_OUT)\bin\VBoxTestOGL.exe" /> 349 348 <?endif ?> 350 349 <?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?> … … 411 410 <?endif ?> 412 411 413 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>414 <Component Id="cp_VBoxCROpenGL" Guid="874A1297-835A-491D-8A9D-7E723BC29EE7" Win64="$(var.Property_Win64)">415 <File Id="file_VBoxSharedCrOpenGL.dll" Name="VBoxSharedCrOpenGL.dll"416 Source="$(env.PATH_OUT)\bin\VBoxSharedCrOpenGL.dll" />417 </Component>418 <?endif?>419 412 <!-- SDL plugins --> 420 413 <Component Id="cp_VBoxSDLBinaries" Guid="F09D5FD9-E176-42B0-90A9-481BB18B0CB4" -
trunk/src/VBox/Installer/win/VirtualBox.wxs
r80122 r80360 446 446 <?endif ?> 447 447 448 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>449 <ComponentRef Id="cp_VBoxCROpenGL" />450 <?endif ?>451 448 <ComponentRef Id="cp_VBoxSDLBinaries" /> 452 449 <?if $(env.VBOX_WITH_WEBSERVICES) = "yes" ?>
Note:
See TracChangeset
for help on using the changeset viewer.