Changeset 35365 in vbox
- Timestamp:
- Dec 30, 2010 12:32:53 PM (14 years ago)
- Location:
- trunk/src/VBox/Additions/WINNT/Installer
- Files:
-
- 4 edited
-
Makefile.kmk (modified) (2 diffs)
-
VBoxGuestAdditions.nsi (modified) (1 diff)
-
VBoxGuestAdditionsCommon.nsh (modified) (1 diff)
-
VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk
r35319 r35365 116 116 $(PATH_BIN)/additions/VBoxOGLfeedbackspu.dll \ 117 117 $(PATH_BIN)/additions/VBoxOGL.dll \ 118 $(VBOX_PATH_ADDITIONS.win.x86)/libWine.dll \ 119 $(VBOX_PATH_ADDITIONS.win.x86)/wined3d.dll \ 120 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D9.dll \ 121 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D8.dll 118 $(PATH_BIN)/additions/wined3d.dll \ 119 $(PATH_BIN)/additions/VBoxD3D9.dll \ 120 $(PATH_BIN)/additions/VBoxD3D8.dll 121 ifeq ($(KBUILD_TARGET_ARCH),x86) 122 DRIVER_FILES += \ 123 $(PATH_BIN)/additions/libWine.dll 124 endif 122 125 ifeq ($(KBUILD_TARGET_ARCH),amd64) 123 126 # Also include 32-bit DLLs on 64-bit guests to enable … … 130 133 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLpassthroughspu.dll \ 131 134 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLfeedbackspu.dll \ 132 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGL.dll 135 $(VBOX_PATH_ADDITIONS.win.x86)/libWine.dll \ 136 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGL.dll \ 137 $(VBOX_PATH_ADDITIONS.win.x86)/wined3d.dll \ 138 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D9.dll \ 139 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D8.dll 140 133 141 endif 134 142 endif -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi
r34745 r35365 756 756 ${EndIf} 757 757 758 ; crOpenGL: Do *not* install 64-bit files - they don't work yet (use !define LIBRARY_X64 later)759 ; Only 32-bit apps on 64-bit work (see next block)758 SetOutPath $g_strSystemDir 759 DetailPrint "Installing Direct3D support ..." 760 760 !if $%BUILD_TARGET_ARCH% == "x86" 761 SetOutPath $g_strSystemDir762 DetailPrint "Installing Direct3D support ..."763 761 FILE "$%PATH_OUT%\bin\additions\libWine.dll" 764 FILE "$%PATH_OUT%\bin\additions\VBoxD3D8.dll"765 FILE "$%PATH_OUT%\bin\additions\VBoxD3D9.dll"766 FILE "$%PATH_OUT%\bin\additions\wined3d.dll"767 768 ; Update DLL cache769 SetOutPath "$g_strSystemDir\dllcache"770 IfFileExists "$g_strSystemDir\dllcache\msd3d8.dll" +1771 CopyFiles /SILENT "$g_strSystemDir\dllcache\d3d8.dll" "$g_strSystemDir\dllcache\msd3d8.dll"772 IfFileExists "$g_strSystemDir\dllcache\msd3d9.dll" +1773 CopyFiles /SILENT "$g_strSystemDir\dllcache\d3d9.dll" "$g_strSystemDir\dllcache\msd3d9.dll"774 775 Push "$g_strSystemDir\dllcache\d3d8.dll"776 Call PrepareWRPFile777 778 Push "$g_strSystemDir\dllcache\d3d9.dll"779 Call PrepareWRPFile780 781 ; Exchange DLLs782 !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\dllcache\d3d8.dll" "$TEMP"783 !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\dllcache\d3d9.dll" "$TEMP"784 785 ; If exchange above failed, do it on reboot786 !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\dllcache\d3d8.dll" "$TEMP"787 !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\dllcache\d3d9.dll" "$TEMP"788 789 ; Save original DLLs ...790 SetOutPath $g_strSystemDir791 IfFileExists "$g_strSystemDir\msd3d8.dll" +1792 CopyFiles /SILENT "$g_strSystemDir\d3d8.dll" "$g_strSystemDir\msd3d8.dll"793 IfFileExists "$g_strSystemDir\msd3d8.dll" +1794 CopyFiles /SILENT "$g_strSystemDir\d3d9.dll" "$g_strSystemDir\msd3d9.dll"795 796 Push "$g_strSystemDir\d3d8.dll"797 Call PrepareWRPFile798 799 Push "$g_strSystemDir\d3d9.dll"800 Call PrepareWRPFile801 802 ; Exchange DLLs803 !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\d3d8.dll" "$TEMP"804 !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\d3d9.dll" "$TEMP"805 806 ; If exchange above failed, do it on reboot807 !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\d3d8.dll" "$TEMP"808 !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\d3d9.dll" "$TEMP"809 762 !endif 763 FILE "$%PATH_OUT%\bin\additions\VBoxD3D8.dll" 764 FILE "$%PATH_OUT%\bin\additions\VBoxD3D9.dll" 765 FILE "$%PATH_OUT%\bin\additions\wined3d.dll" 766 767 ; Update DLL cache 768 SetOutPath "$g_strSystemDir\dllcache" 769 IfFileExists "$g_strSystemDir\dllcache\msd3d8.dll" +1 770 CopyFiles /SILENT "$g_strSystemDir\dllcache\d3d8.dll" "$g_strSystemDir\dllcache\msd3d8.dll" 771 IfFileExists "$g_strSystemDir\dllcache\msd3d9.dll" +1 772 CopyFiles /SILENT "$g_strSystemDir\dllcache\d3d9.dll" "$g_strSystemDir\dllcache\msd3d9.dll" 773 774 Push "$g_strSystemDir\dllcache\d3d8.dll" 775 Call PrepareWRPFile 776 777 Push "$g_strSystemDir\dllcache\d3d9.dll" 778 Call PrepareWRPFile 779 780 ; Exchange DLLs 781 !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\dllcache\d3d8.dll" "$TEMP" 782 !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\dllcache\d3d9.dll" "$TEMP" 783 784 ; If exchange above failed, do it on reboot 785 !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\dllcache\d3d8.dll" "$TEMP" 786 !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\dllcache\d3d9.dll" "$TEMP" 787 788 ; Save original DLLs ... 789 SetOutPath $g_strSystemDir 790 IfFileExists "$g_strSystemDir\msd3d8.dll" +1 791 CopyFiles /SILENT "$g_strSystemDir\d3d8.dll" "$g_strSystemDir\msd3d8.dll" 792 IfFileExists "$g_strSystemDir\msd3d8.dll" +1 793 CopyFiles /SILENT "$g_strSystemDir\d3d9.dll" "$g_strSystemDir\msd3d9.dll" 794 795 Push "$g_strSystemDir\d3d8.dll" 796 Call PrepareWRPFile 797 798 Push "$g_strSystemDir\d3d9.dll" 799 Call PrepareWRPFile 800 801 ; Exchange DLLs 802 !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\d3d8.dll" "$TEMP" 803 !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\d3d9.dll" "$TEMP" 804 805 ; If exchange above failed, do it on reboot 806 !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\d3d8.dll" "$TEMP" 807 !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\d3d9.dll" "$TEMP" 810 808 811 809 !if $%BUILD_TARGET_ARCH% == "amd64" -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh
r35319 r35365 32 32 FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll" 33 33 34 ; Do *not* install 64-bit d3d files - they don't work yet 34 SetOutPath "$0\VBoxVideo\OpenGL" 35 FILE "$%PATH_OUT%\bin\additions\d3d8.dll" 36 FILE "$%PATH_OUT%\bin\additions\d3d9.dll" 35 37 !if $%BUILD_TARGET_ARCH% == "x86" 36 SetOutPath "$0\VBoxVideo\OpenGL" 37 FILE "$%PATH_OUT%\bin\additions\d3d8.dll" 38 FILE "$%PATH_OUT%\bin\additions\d3d9.dll" 38 ; libWine is used for 32bit d3d only 39 ; @todo: remove it for 32bit as well 39 40 FILE "$%PATH_OUT%\bin\additions\libWine.dll" 40 FILE "$%PATH_OUT%\bin\additions\VBoxD3D8.dll"41 FILE "$%PATH_OUT%\bin\additions\VBoxD3D9.dll"42 FILE "$%PATH_OUT%\bin\additions\wined3d.dll"43 41 !endif 42 FILE "$%PATH_OUT%\bin\additions\VBoxD3D8.dll" 43 FILE "$%PATH_OUT%\bin\additions\VBoxD3D9.dll" 44 FILE "$%PATH_OUT%\bin\additions\wined3d.dll" 44 45 45 46 !if $%BUILD_TARGET_ARCH% == "amd64" -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh
r35319 r35365 597 597 598 598 DetailPrint "Removing 3D graphics support ..." 599 !if $%BUILD_TARGET_ARCH% == "x86" 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 ! else ; amd64599 600 Delete /REBOOTOK "$g_strSystemDir\VBoxOGLarrayspu.dll" 601 Delete /REBOOTOK "$g_strSystemDir\VBoxOGLcrutil.dll" 602 Delete /REBOOTOK "$g_strSystemDir\VBoxOGLerrorspu.dll" 603 Delete /REBOOTOK "$g_strSystemDir\VBoxOGLpackspu.dll" 604 Delete /REBOOTOK "$g_strSystemDir\VBoxOGLpassthroughspu.dll" 605 Delete /REBOOTOK "$g_strSystemDir\VBoxOGLfeedbackspu.dll" 606 Delete /REBOOTOK "$g_strSystemDir\VBoxOGL.dll" 607 608 ; Remove D3D stuff 609 ; @todo add a feature flag to only remove if installed explicitly 610 Delete /REBOOTOK "$g_strSystemDir\libWine.dll" 611 Delete /REBOOTOK "$g_strSystemDir\VBoxD3D8.dll" 612 Delete /REBOOTOK "$g_strSystemDir\VBoxD3D9.dll" 613 Delete /REBOOTOK "$g_strSystemDir\wined3d.dll" 614 ; Update DLL cache 615 IfFileExists "$g_strSystemDir\dllcache\msd3d8.dll" 0 +2 616 Delete /REBOOTOK "$g_strSystemDir\dllcache\d3d8.dll" 617 Rename /REBOOTOK "$g_strSystemDir\dllcache\msd3d8.dll" "$g_strSystemDir\dllcache\d3d8.dll" 618 IfFileExists g_strSystemDir\dllcache\msd3d9.dll" 0 +2 619 Delete /REBOOTOK "$g_strSystemDir\dllcache\d3d9.dll" 620 Rename /REBOOTOK "$g_strSystemDir\dllcache\msd3d9.dll" "$g_strSystemDir\dllcache\d3d9.dll" 621 ; Restore original DX DLLs 622 IfFileExists "$g_strSystemDir\msd3d8.dll" 0 +2 623 Delete /REBOOTOK "$g_strSystemDir\d3d8.dll" 624 Rename /REBOOTOK "$g_strSystemDir\msd3d8.dll" "$g_strSystemDir\d3d8.dll" 625 IfFileExists "$g_strSystemDir\msd3d9.dll" 0 +2 626 Delete /REBOOTOK "$g_strSystemDir\d3d9.dll" 627 Rename /REBOOTOK "$g_strSystemDir\msd3d9.dll" "$g_strSystemDir\d3d9.dll" 628 629 !if $%BUILD_TARGET_ARCH% == "amd64" 630 630 631 631 ; Only 64-bit installer: Also remove 32-bit DLLs on 64-bit target arch in Wow64 node
Note:
See TracChangeset
for help on using the changeset viewer.
