- Timestamp:
- Apr 28, 2019 3:23:27 PM (6 years ago)
- Location:
- trunk/src/VBox/Additions
- Files:
-
- 1 deleted
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
r76553 r78340 106 106 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \ 107 107 $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll \ 108 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu.dll \109 108 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll \ 110 109 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll \ … … 116 115 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \ 117 116 $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll \ 118 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu-x86.dll \119 117 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll \ 120 118 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll \ … … 185 183 $(INSTALL) -m 644 $< $(@D) 186 184 187 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu.dll: $(PATH_OBJ)/VBoxOGLarrayspu/VBoxOGLarrayspu.dll | $$(dir $$@)188 $(INSTALL) -m 644 $< $(@D)189 190 185 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll: $(PATH_OBJ)/VBoxOGLcrutil/VBoxOGLcrutil.dll | $$(dir $$@) 191 186 $(INSTALL) -m 644 $< $(@D) … … 211 206 212 207 $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll: $(PATH_OBJ)/wined3dwddm-x86/wined3dwddm-x86.dll | $$(dir $$@) 213 $(INSTALL) -m 644 $< $(@D)214 215 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu-x86.dll: $(PATH_OBJ)/VBoxOGLarrayspu-x86/VBoxOGLarrayspu-x86.dll | $$(dir $$@)216 208 $(INSTALL) -m 644 $< $(@D) 217 209 … … 251 243 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \ 252 244 $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll \ 253 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu.dll \254 245 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll \ 255 246 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll \ … … 261 252 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \ 262 253 $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll \ 263 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu-x86.dll \264 254 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll \ 265 255 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll \ -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf
r76553 r78340 71 71 ;gl VBoxD3D9wddm.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 72 72 ;gl wined3dwddm.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 73 ;gl VBoxOGLarrayspu.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME74 73 ;gl VBoxOGLcrutil.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 75 74 ;gl VBoxOGLerrorspu.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME … … 82 81 ;amd64 ;gl VBoxD3D9wddm-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 83 82 ;amd64 ;gl wined3dwddm-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 84 ;amd64 ;gl VBoxOGLarrayspu-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME85 83 ;amd64 ;gl VBoxOGLcrutil-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 86 84 ;amd64 ;gl VBoxOGLerrorspu-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME … … 142 140 ;amd64 ;gl wined3dwddm-x86.dll = 1 143 141 ;gl wined3dwddm.dll = 1 144 ;amd64 ;gl VBoxOGLarrayspu-x86.dll = 1145 ;gl VBoxOGLarrayspu.dll = 1146 142 ;amd64 ;gl VBoxOGLcrutil-x86.dll = 1 147 143 ;gl VBoxOGLcrutil.dll = 1 -
trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk
r76953 r78340 102 102 ifdef VBOX_WITH_CROGL 103 103 DRIVER_FILES += \ 104 $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu.dll \105 104 $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil.dll \ 106 105 $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu.dll \ … … 116 115 # running 32-bit OpenGL apps on that. 117 116 DRIVER_FILES += \ 118 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLarrayspu.dll \119 117 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLcrutil.dll \ 120 118 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLerrorspu.dll \ … … 165 163 $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm-x86.dll \ 166 164 $(PATH_STAGE_BIN)/additions/VBoxOGL-x86.dll \ 167 $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu-x86.dll \168 165 $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil-x86.dll \ 169 166 $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu-x86.dll \ -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh
r76553 r78340 64 64 !if $%VBOX_WITH_CROGL% == "1" 65 65 ; crOpenGL 66 FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"67 66 FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll" 68 67 FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll" … … 84 83 FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" 85 84 FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" 86 FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLarrayspu.dll"87 85 FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLcrutil.dll" 88 86 FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLerrorspu.dll" … … 115 113 116 114 !if $%VBOX_WITH_CROGL% == "1" 117 FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"118 115 FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll" 119 116 FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll" … … 137 134 138 135 !if $%VBOX_WITH_CROGL% == "1" 139 FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"140 136 FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll" 141 137 FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll" -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh
r76553 r78340 248 248 249 249 !if $%VBOX_WITH_CROGL% == "1" 250 FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"251 250 FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll" 252 251 FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll" … … 270 269 271 270 !if $%VBOX_WITH_CROGL% == "1" 272 FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"273 271 FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll" 274 272 FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll" … … 294 292 StrCpy $0 "$TEMP\VBoxGuestAdditions\VBoxOGL" 295 293 CreateDirectory "$0" 296 !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll" "$g_strSystemDir\VBoxOGLarrayspu.dll" "$0"297 294 !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll" "$g_strSystemDir\VBoxOGLcrutil.dll" "$0" 298 295 !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll" "$g_strSystemDir\VBoxOGLerrorspu.dll" "$0" … … 312 309 ; path after calling EnableX64FSRedirection 313 310 ${EnableX64FSRedirection} 314 !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLarrayspu.dll" "$SYSDIR\VBoxOGLarrayspu.dll" "$0"315 311 !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLcrutil.dll" "$SYSDIR\VBoxOGLcrutil.dll" "$0" 316 312 !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLerrorspu.dll" "$SYSDIR\VBoxOGLerrorspu.dll" "$0" … … 544 540 !endif 545 541 546 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"547 542 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll" 548 543 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll" … … 566 561 !endif 567 562 568 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"569 563 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll" 570 564 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll" … … 654 648 ${EndIf} 655 649 656 Delete /REBOOTOK "$g_strSystemDir\VBoxOGLarrayspu.dll"657 650 Delete /REBOOTOK "$g_strSystemDir\VBoxOGLcrutil.dll" 658 651 Delete /REBOOTOK "$g_strSystemDir\VBoxOGLerrorspu.dll" … … 689 682 !if $%BUILD_TARGET_ARCH% == "amd64" 690 683 ; Only 64-bit installer: Also remove 32-bit DLLs on 64-bit target arch in Wow64 node 691 Delete /REBOOTOK "$g_strSysWow64\VBoxOGLarrayspu.dll"692 684 Delete /REBOOTOK "$g_strSysWow64\VBoxOGLcrutil.dll" 693 685 Delete /REBOOTOK "$g_strSysWow64\VBoxOGLerrorspu.dll" -
trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp
r76553 r78340 1347 1347 So just enumerate the 32-bit files in the SYSWOW directory. */ 1348 1348 #ifdef RT_ARCH_AMD64 1349 { szSysWowDir, "VBoxOGLarrayspu.dll" },1350 1349 { szSysWowDir, "VBoxOGLcrutil.dll" }, 1351 1350 { szSysWowDir, "VBoxOGLerrorspu.dll" }, … … 1355 1354 { szSysWowDir, "VBoxOGL.dll" }, 1356 1355 #else /* !RT_ARCH_AMD64 */ 1357 { szSysDir, "VBoxOGLarrayspu.dll" },1358 1356 { szSysDir, "VBoxOGLcrutil.dll" }, 1359 1357 { szSysDir, "VBoxOGLerrorspu.dll" }, -
trunk/src/VBox/Additions/common/crOpenGL/.scm-settings
r76553 r78340 18 18 # Much of this is externally licensed, but not all, sigh. 19 19 --external-copyright --no-convert-tabs 20 21 /array/arrayspu.rc: --no-external-copyright --convert-tabs22 20 23 21 /feedback/feedbackspu.rc: --no-external-copyright --convert-tabs -
trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk
r76553 r78340 28 28 DLLS += \ 29 29 VBoxOGL \ 30 VBoxOGLarrayspu \31 30 VBoxOGLpassthroughspu \ 32 31 VBoxOGLpackspu \ … … 36 35 VBOX_OGL_X86_GUEST_DLLS = \ 37 36 VBoxOGL-x86 \ 38 VBoxOGLarrayspu-x86 \39 37 VBoxOGLpassthroughspu-x86 \ 40 38 VBoxOGLpackspu-x86 \ … … 445 443 endif # VBOX_OGL_GLX_USE_CSTUBS 446 444 endif 447 endif448 449 #450 # VBoxOGLarrayspu451 #452 VBoxOGLarrayspu_TEMPLATE = VBOXCROGLR3GUESTDLL453 VBoxOGLarrayspu_INCS = \454 array \455 $(VBOX_GRAPHICS_INCS)456 if1of ($(KBUILD_TARGET), linux solaris freebsd)457 VBoxOGLarrayspu_INCS += \458 $(VBOX_GL_INCS)459 endif460 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)461 VBoxOGLarrayspu_INSTTYPE.win = none462 VBoxOGLarrayspu_DEBUG_INSTTYPE.win = both463 endif464 VBoxOGLarrayspu_INCS.darwin += $(PATH_OUT)/obj/VBoxOGL465 VBoxOGLarrayspu_INTERMEDIATES = \466 $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \467 $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h468 VBoxOGLarrayspu_SOURCES = \469 array/arrayspu.c \470 array/arrayspu_config.c \471 array/arrayspu_init.c472 VBoxOGLarrayspu_SOURCES.win = \473 array/arrayspu.def \474 array/arrayspu.rc475 VBoxOGLarrayspu_LIBS = \476 $(VBOX_LIB_OGL_CRUTIL) \477 $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \478 $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)479 ifdef VBOX_WITH_CRHGSMI480 VBoxOGLarrayspu_DEFS.win += VBOX_WITH_CRHGSMI481 endif482 ifdef VBOX_WITH_WDDM483 VBoxOGLarrayspu_DEFS.win += VBOX_WITH_WDDM484 endif485 486 ifdef VBOX_WITH_WDDM487 #488 # VBoxOGLarrayspu-x86 - x86 version of VBoxOGLarrayspu built for amd64 build489 #490 VBoxOGLarrayspu-x86_EXTENDS = VBoxOGLarrayspu491 VBoxOGLarrayspu-x86_BLD_TRG_ARCH = x86492 VBoxOGLarrayspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \493 $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \494 $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)495 VBoxOGLarrayspu-x86_DEFS = $(VBoxOGLarrayspu_DEFS) VBOX_WDDM_WOW64496 445 endif 497 446 … … 670 619 VBoxOGLfeedbackspu_DEBUG_INSTTYPE.win = both 671 620 endif 672 VBoxOGL arrayspu_INTERMEDIATES = \621 VBoxOGLfeedbackspu_INTERMEDIATES = \ 673 622 $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_proto.h 674 623 VBoxOGLfeedbackspu_SOURCES = \ -
trunk/src/VBox/Additions/freebsd/Makefile.kmk
r76553 r78340 68 68 vboxvideo_drv_16.so \ 69 69 vboxvideo_drv_17.so \ 70 VBoxOGLarrayspu.so \71 70 VBoxOGLcrutil.so \ 72 71 VBoxOGLerrorspu.so \ -
trunk/src/VBox/Additions/linux/Makefile.kmk
r77306 r78340 125 125 ifdef VBOX_WITH_CROGL 126 126 VBOX_LNX_ADD_STRIP_LIB += \ 127 VBoxOGLarrayspu.so \128 127 VBoxOGLcrutil.so \ 129 128 VBoxOGLerrorspu.so \ -
trunk/src/VBox/Additions/linux/installer/deffiles
r76553 r78340 32 32 /usr/sbin/VBoxService \ 33 33 /sbin/mount.vboxsf \ 34 /usr/lib/VBoxOGLarrayspu.so \35 /usr/lib64/VBoxOGLarrayspu.so \36 34 /usr/lib/VBoxOGLcrutil.so \ 37 35 /usr/lib64/VBoxOGLcrutil.so \ -
trunk/src/VBox/Additions/solaris/Makefile.kmk
r76553 r78340 174 174 VBoxOGLfeedbackspu.so \ 175 175 VBoxOGLpassthroughspu.so \ 176 VBoxOGLarrayspu.so \177 176 VBoxOGLerrorspu.so \ 178 177 VBoxOGLpackspu.so
Note:
See TracChangeset
for help on using the changeset viewer.