Skip to content

Commit 30fdc4f

Browse files
committed
Update icons / update setup to redist c++ 2013
1 parent d418b74 commit 30fdc4f

File tree

8 files changed

+18
-22
lines changed

8 files changed

+18
-22
lines changed

OCS_DEPLOY_TOOL.APS

0 Bytes
Binary file not shown.

Setup/Banner-ocs.bmp

68 Bytes
Binary file not shown.

Setup/OCS-NG-48.bmp

0 Bytes
Binary file not shown.

Setup/install-ocs.ico

90.3 KB
Binary file not shown.

Setup/setup.nsi

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,15 @@ FunctionEnd
9797
Section "Main Files" SEC01
9898
SetOutPath "$INSTDIR"
9999
SetOverwrite ifnewer
100-
; MSVC 9 CRT redist
101-
File "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
102-
File "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvcm90.dll"
103-
File "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvcp90.dll"
104-
File "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvcr90.dll"
105-
; MSVC 9 MFC redist
106-
File "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\\Microsoft.VC90.MFC\Microsoft.VC90.MFC.manifest"
107-
File "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\\Microsoft.VC90.MFC\mfc90.dll"
108-
File "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\\Microsoft.VC90.MFC\mfc90u.dll"
109-
File "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\\Microsoft.VC90.MFC\mfcm90.dll"
110-
File "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\\Microsoft.VC90.MFC\mfcm90u.dll"
100+
; MSVC 12 CRT redist
101+
; File "C:\Windows\System32\msvcm120.dll"
102+
File "C:\Windows\System32\msvcp120.dll"
103+
File "C:\Windows\System32\msvcr120.dll"
104+
; MSVC 12 MFC redist
105+
File "C:\Windows\System32\mfc120.dll"
106+
File "C:\Windows\System32\mfc120u.dll"
107+
File "C:\Windows\System32\mfcm120.dll"
108+
File "C:\Windows\System32\mfcm120u.dll"
111109
; ocsinventory-deploy-tool
112110
File "..\Release\ocsinventory-deploy-tool.exe"
113111
File "modules.conf"
@@ -164,17 +162,15 @@ Section Uninstall
164162
Delete "$INSTDIR\setup.sh"
165163
Delete "$INSTDIR\modules.conf"
166164
Delete "$INSTDIR\ocsinventory-deploy-tool.exe"
167-
; MSVC 9 CRT redist
168-
Delete "$INSTDIR\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
169-
Delete "$INSTDIR\Microsoft.VC90.CRT\msvcm90.dll"
170-
Delete "$INSTDIR\Microsoft.VC90.CRT\msvcp90.dll"
171-
Delete "$INSTDIR\Microsoft.VC90.CRT\msvcr90.dll"
172-
; MSVC 9 MFC redist
173-
Delete "$INSTDIR\Microsoft.VC90.MFC\Microsoft.VC90.MFC.manifest"
174-
Delete "$INSTDIR\Microsoft.VC90.MFC\mfc90.dll"
175-
Delete "$INSTDIR\Microsoft.VC90.MFC\mfc90u.dll"
176-
Delete "$INSTDIR\Microsoft.VC90.MFC\mfcm90.dll"
177-
Delete "$INSTDIR\Microsoft.VC90.MFC\mfcm90u.dll"
165+
; MSVC 12 CRT redist
166+
Delete "$INSTDIR\msvcm120.dll"
167+
Delete "$INSTDIR\msvcp120.dll"
168+
Delete "$INSTDIR\msvcr120.dll"
169+
; MSVC 12 MFC redist
170+
Delete "$INSTDIR\mfc120.dll"
171+
Delete "$INSTDIR\mfc120u.dll"
172+
Delete "$INSTDIR\mfcm120.dll"
173+
Delete "$INSTDIR\mfcm120u.dll"
178174

179175
; Remove icon group to All Users
180176
SetShellVarContext all

Setup/uninstall-ocs.ico

90.3 KB
Binary file not shown.

res/OCSInventory.ico

90.3 KB
Binary file not shown.

res/OCS_DEPLOY_TOOL.ico

105 KB
Binary file not shown.

0 commit comments

Comments
 (0)