VirtualBox

Ignore:
Timestamp:
May 6, 2019 9:31:01 PM (6 years ago)
Author:
vboxsync
Message:

Additions,GuestHost/OpenGL,HostServices/SharedOpenGL: Get rid of the individual SPU shared libraries and merge them into the VBoxSharedCrOpenGL shared libraries on the host and VBoxOGL{,-x86} shared libraries for the guest additions, bugref:9435

Location:
trunk/src/VBox/Additions/WINNT/Installer
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r78388 r78408  
    102102ifdef VBOX_WITH_CROGL
    103103DRIVER_FILES += \
    104         $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil.dll \
    105         $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu.dll \
    106         $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu.dll \
    107         $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu.dll \
    108         $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu.dll \
    109104        $(PATH_STAGE_BIN)/additions/VBoxOGL.dll \
    110105        $(PATH_STAGE_BIN)/additions/wined3d.dll \
    … …  
    115110        # running 32-bit OpenGL apps on that.
    116111        DRIVER_FILES += \
    117                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLcrutil.dll \
    118                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLerrorspu.dll \
    119                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLpackspu.dll \
    120                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLpassthroughspu.dll \
    121                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLfeedbackspu.dll \
    122112                $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGL.dll \
    123113                $(VBOX_PATH_ADDITIONS.win.x86)/wined3d.dll \
    124114                $(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D9.dll \
    125115                $(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D8.dll
    126 
    127116 endif
    128117endif
    … …  
    162151        $(PATH_STAGE_BIN)/additions/wined3dwddm-x86.dll \
    163152        $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm-x86.dll \
    164         $(PATH_STAGE_BIN)/additions/VBoxOGL-x86.dll \
    165         $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil-x86.dll \
    166         $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu-x86.dll \
    167         $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu-x86.dll \
    168         $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu-x86.dll \
    169         $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu-x86.dll
     153        $(PATH_STAGE_BIN)/additions/VBoxOGL-x86.dll
    170154  endif
    171155 endif
    172156endif
    173 
    174157VB_WIN_ADD_NSIS_ENV := \
    175158        -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

    r78340 r78408  
    6464!if $%VBOX_WITH_CROGL% == "1"
    6565  ; crOpenGL
    66   FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
    67   FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
    68   FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
    69   FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
    70   FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
    7166  FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
    7267
    … …  
    8378    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll"
    8479    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll"
    85     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLcrutil.dll"
    86     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLerrorspu.dll"
    87     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLpackspu.dll"
    88     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLpassthroughspu.dll"
    89     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLfeedbackspu.dll"
    9080    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGL.dll"
    9181    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D8.dll"
    … …  
    113103
    114104  !if $%VBOX_WITH_CROGL% == "1"
    115     FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
    116     FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
    117     FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
    118     FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
    119     FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
    120105    FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
    121106
    … …  
    134119
    135120    !if $%VBOX_WITH_CROGL% == "1"
    136       FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
    137       FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
    138       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
    139       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
    140       FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
    141121      FILE "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
    142122

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

    r78389 r78408  
    248248
    249249    !if $%VBOX_WITH_CROGL% == "1"
    250       FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
    251       FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
    252       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
    253       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
    254       FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
    255250      FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
    256251
    … …  
    269264
    270265      !if $%VBOX_WITH_CROGL% == "1"
    271         FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
    272         FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
    273         FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
    274         FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
    275         FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
    276266        FILE "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
    277267
    … …  
    292282  StrCpy $0 "$TEMP\VBoxGuestAdditions\VBoxOGL"
    293283  CreateDirectory "$0"
    294   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"         "$g_strSystemDir\VBoxOGLcrutil.dll"         "$0"
    295   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"       "$g_strSystemDir\VBoxOGLerrorspu.dll"       "$0"
    296   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"        "$g_strSystemDir\VBoxOGLpackspu.dll"        "$0"
    297   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll" "$g_strSystemDir\VBoxOGLpassthroughspu.dll" "$0"
    298   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"    "$g_strSystemDir\VBoxOGLfeedbackspu.dll"    "$0"
    299284  !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGL.dll"               "$g_strSystemDir\VBoxOGL.dll"               "$0"
    300285  !if $%BUILD_TARGET_ARCH% == "amd64"
    … …  
    309294    ; path after calling EnableX64FSRedirection
    310295    ${EnableX64FSRedirection}
    311     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLcrutil.dll"         "$SYSDIR\VBoxOGLcrutil.dll"         "$0"
    312     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLerrorspu.dll"       "$SYSDIR\VBoxOGLerrorspu.dll"       "$0"
    313     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLpackspu.dll"        "$SYSDIR\VBoxOGLpackspu.dll"        "$0"
    314     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLpassthroughspu.dll" "$SYSDIR\VBoxOGLpassthroughspu.dll" "$0"
    315     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLfeedbackspu.dll"    "$SYSDIR\VBoxOGLfeedbackspu.dll"    "$0"
    316296    !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGL.dll"               "$SYSDIR\VBoxOGL.dll"               "$0"
    317297    ${DisableX64FSRedirection}
    … …  
    540520  !endif
    541521
     522    ; Obsolete files begin (they were merged into VBoxOGL.dll)
    542523    Delete /REBOOTOK "$INSTDIR\VBoxOGLcrutil.dll"
    543524    Delete /REBOOTOK "$INSTDIR\VBoxOGLarrayspu.dll"
    … …  
    546527    Delete /REBOOTOK "$INSTDIR\VBoxOGLpassthroughspu.dll"
    547528    Delete /REBOOTOK "$INSTDIR\VBoxOGLfeedbackspu.dll"
     529    ; Obsolete files end
     530
    548531    Delete /REBOOTOK "$INSTDIR\VBoxOGL.dll"
    549532
    … …  
    562545    !endif
    563546
     547      ; Obsolete files begin (they were merged into VBoxOGL-x86.dll)
    564548      Delete /REBOOTOK "$INSTDIR\VBoxOGLcrutil-x86.dll"
    565549      Delete /REBOOTOK "$INSTDIR\VBoxOGLarrayspu-x86.dll"
    … …  
    568552      Delete /REBOOTOK "$INSTDIR\VBoxOGLpassthroughspu-x86.dll"
    569553      Delete /REBOOTOK "$INSTDIR\VBoxOGLfeedbackspu-x86.dll"
     554      ; Obsolete files end
     555
    570556      Delete /REBOOTOK "$INSTDIR\VBoxOGL-x86.dll"
    571557
    … …  
    661647  ${EndIf}
    662648
     649  ; Obsolete files begin (they were merged into VBoxOGL.dll)
    663650  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLcrutil.dll"
    664651  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLarrayspu.dll"
    … …  
    667654  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLpassthroughspu.dll"
    668655  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLfeedbackspu.dll"
     656  ; Obsolete files end
     657
    669658  Delete /REBOOTOK "$g_strSystemDir\VBoxOGL.dll"
    670659
    … …  
    698687  !if $%BUILD_TARGET_ARCH% == "amd64"
    699688    ; Only 64-bit installer: Also remove 32-bit DLLs on 64-bit target arch in Wow64 node
     689    ; Obsolete files begin (they were merged into VBoxOGL-x86.dll)
    700690    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLcrutil-x86.dll"
    701691    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLarrayspu-x86.dll"
    … …  
    704694    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpassthroughspu-x86.dll"
    705695    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLfeedbackspu-x86.dll"
     696    ; Obsolete files end
     697
    706698    Delete /REBOOTOK "$g_strSysWow64\VBoxOGL-x86.dll"
    707699
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