Changeset 75566 in vbox for trunk/src/VBox/Additions/WINNT
- Timestamp:
- Nov 19, 2018 11:12:03 AM (6 years ago)
- Location:
- trunk/src/VBox/Additions/WINNT
- Files:
-
- 5 edited
-
Graphics/Video/Makefile.kmk (modified) (4 diffs)
-
Graphics/Video/mp/wddm/VBoxWddm.inf (modified) (4 diffs)
-
Installer/Makefile.kmk (modified) (2 diffs)
-
Installer/VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)
-
Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
r75445 r75566 92 92 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \ 93 93 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll \ 94 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll \ 94 95 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll 95 96 VBoxWddm-inf_SOURCES.amd64 += \ 96 97 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll \ 97 98 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll \ 99 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD-x86.dll \ 98 100 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll 99 101 endif … … 156 158 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll: $$(VBoxSVGA_1_TARGET) | $$(dir $$@) 157 159 $(INSTALL) -m 644 $< $(@D) 160 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll: $$(VBoxICD_1_TARGET) | $$(dir $$@) 161 $(INSTALL) -m 644 $< $(@D) 158 162 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll: $$(VBoxGL_1_TARGET) | $$(dir $$@) 159 163 $(INSTALL) -m 644 $< $(@D) … … 163 167 $(INSTALL) -m 644 $< $(@D) 164 168 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll: $$(VBoxSVGA-x86_1_TARGET) | $$(dir $$@) 169 $(INSTALL) -m 644 $< $(@D) 170 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD-x86.dll: $$(VBoxICD-x86_1_TARGET) | $$(dir $$@) 165 171 $(INSTALL) -m 644 $< $(@D) 166 172 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll: $$(VBoxGL-x86_1_TARGET) | $$(dir $$@) … … 235 241 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \ 236 242 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll \ 243 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll \ 237 244 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll \ 238 245 $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \ 239 246 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll \ 240 247 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll \ 248 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD-x86.dll \ 241 249 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll, ), ) \ 242 250 $(if $(VBOXWDDM_WITH_GL), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL.dll \ -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf
r75445 r75566 57 57 ;mesa3d VBoxNine.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 58 58 ;mesa3d VBoxSVGA.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 59 ;mesa3d VBoxICD.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 59 60 ;mesa3d VBoxGL.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 60 61 … … 63 64 ;amd64 ;mesa3d VBoxNine-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 64 65 ;amd64 ;mesa3d VBoxSVGA-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 66 ;amd64 ;mesa3d VBoxICD-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 65 67 ;amd64 ;mesa3d VBoxGL-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 66 68 … … 91 93 ;dispd3d HKR,, UserModeDriverName, %REG_MULTI_SZ%, VBoxDispD3D.dll 92 94 ;amd64 ;dispd3d HKR,, UserModeDriverNameWow, %REG_MULTI_SZ%, VBoxDispD3D-x86.dll 93 ;icd HKR,, OpenGLDriverName, %REG_MULTI_SZ%, VBox OGL.dll94 ;amd64 ;icd HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBox OGL-x86.dll95 ;icd HKR,, OpenGLDriverName, %REG_MULTI_SZ%, VBoxICD 96 ;amd64 ;icd HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxICD-x86 95 97 ;icd HKR,, OpenGLFlags, %REG_DWORD%, 0x00000001 96 98 ;amd64 ;icd HKR,, OpenGLFlagsWoW, %REG_DWORD%, 0x00000001 … … 127 129 ;amd64 ;mesa3d VBoxNine-x86.dll = 1 128 130 ;amd64 ;mesa3d VBoxSVGA-x86.dll = 1 131 ;amd64 ;mesa3d VBoxICD-x86.dll = 1 129 132 ;amd64 ;mesa3d VBoxGL-x86.dll = 1 130 133 ;dispd3d VBoxDispD3D.dll = 1 131 134 ;mesa3d VBoxNine.dll = 1 132 135 ;mesa3d VBoxSVGA.dll = 1 136 ;mesa3d VBoxICD.dll = 1 133 137 ;mesa3d VBoxGL.dll = 1 134 138 ;amd64 ;gl VBoxOGL-x86.dll = 1 -
trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk
r75445 r75566 138 138 $(PATH_STAGE_BIN)/additions/VBoxNine.dll \ 139 139 $(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \ 140 $(PATH_STAGE_BIN)/additions/VBoxICD.dll \ 140 141 $(PATH_STAGE_BIN)/additions/VBoxGL.dll 141 142 endif … … 156 157 $(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \ 157 158 $(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \ 159 $(PATH_STAGE_BIN)/additions/VBoxICD-x86.dll \ 158 160 $(PATH_STAGE_BIN)/additions/VBoxGL-x86.dll 159 161 endif -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh
r75445 r75566 110 110 FILE "$%PATH_OUT%\bin\additions\VBoxNine.dll" 111 111 FILE "$%PATH_OUT%\bin\additions\VBoxSVGA.dll" 112 FILE "$%PATH_OUT%\bin\additions\VBoxICD.dll" 112 113 FILE "$%PATH_OUT%\bin\additions\VBoxGL.dll" 113 114 !endif … … 131 132 FILE "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll" 132 133 FILE "$%PATH_OUT%\bin\additions\VBoxSVGA-x86.dll" 134 FILE "$%PATH_OUT%\bin\additions\VBoxICD-x86.dll" 133 135 FILE "$%PATH_OUT%\bin\additions\VBoxGL-x86.dll" 134 136 !endif -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh
r75445 r75566 243 243 FILE "$%PATH_OUT%\bin\additions\VBoxNine.dll" 244 244 FILE "$%PATH_OUT%\bin\additions\VBoxSVGA.dll" 245 FILE "$%PATH_OUT%\bin\additions\VBoxICD.dll" 245 246 FILE "$%PATH_OUT%\bin\additions\VBoxGL.dll" 246 247 !endif … … 264 265 FILE "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll" 265 266 FILE "$%PATH_OUT%\bin\additions\VBoxSVGA-x86.dll" 267 FILE "$%PATH_OUT%\bin\additions\VBoxICD-x86.dll" 266 268 FILE "$%PATH_OUT%\bin\additions\VBoxGL-x86.dll" 267 269 !endif … … 538 540 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxNine.dll" 539 541 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxSVGA.dll" 542 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxICD.dll" 540 543 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxGL.dll" 541 544 !endif … … 559 562 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll" 560 563 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxSVGA-x86.dll" 564 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxICD-x86.dll" 561 565 Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxGL-x86.dll" 562 566 !endif … … 632 636 Delete /REBOOTOK "$g_strSystemDir\VBoxNine.dll" 633 637 Delete /REBOOTOK "$g_strSystemDir\VBoxSVGA.dll" 638 Delete /REBOOTOK "$g_strSystemDir\VBoxICD.dll" 634 639 Delete /REBOOTOK "$g_strSystemDir\VBoxGL.dll" 635 640 !endif
Note:
See TracChangeset
for help on using the changeset viewer.
