Skip to content

Commit

Permalink
+ polish x64 installer
Browse files Browse the repository at this point in the history
  • Loading branch information
wwmayer committed Mar 12, 2014
1 parent cd03973 commit 0fe9877
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi
@@ -1,4 +1,4 @@
# Copyright (c) 2010 Werner Mayer <wmayer[at]users.sourceforge.net>
# Copyright (c) 2014 Werner Mayer <wmayer[at]users.sourceforge.net>
#
# This file is part of the FreeCAD CAx development system.
#
Expand Down Expand Up @@ -92,7 +92,7 @@ section "install"
setOutPath $INSTDIR\data
file /r /X CMakeFiles /X *.cmake /X *.dir /X *.vcproj /X CMakeLists.txt /X *.am "..\..\data\"
setOutPath $INSTDIR
#file "vcredist_x86.exe"
file "vcredist_x64.exe"

# Install the Visual Studio redistributable
ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"VCREDI~1.EXE /q:a /c:""msiexec /i vcredist.msi /qb!"" "'
Expand Down Expand Up @@ -158,6 +158,7 @@ section "Uninstall"

# Always delete uninstaller as the last action
Delete $INSTDIR\uninstall.exe
Delete $INSTDIR\vcredist_x64.exe
# Try to remove the install directory - this will only happen if it is empty
RMDir $INSTDIR

Expand Down

0 comments on commit 0fe9877

Please sign in to comment.