Install x64 release into correct Program Files on Windows.

This commit is contained in:
Paul Chote
2019-10-27 22:05:08 +00:00
committed by abcdefg30
parent d2991247a3
commit 3ee697a54d
2 changed files with 18 additions and 5 deletions

View File

@@ -14,7 +14,6 @@
; You should have received a copy of the GNU General Public License
; along with OpenRA. If not, see <http://www.gnu.org/licenses/>.
!include "MUI2.nsh"
!include "FileFunc.nsh"
!include "WordFunc.nsh"
@@ -24,8 +23,20 @@ OutFile "OpenRA.Setup.exe"
ManifestDPIAware true
InstallDir "$PROGRAMFILES\OpenRA${SUFFIX}"
InstallDirRegKey HKLM "Software\OpenRA${SUFFIX}" "InstallDir"
Function .onInit
!ifndef USE_PROGRAMFILES32
SetRegView 64
!endif
ReadRegStr $INSTDIR HKLM "Software\OpenRA${SUFFIX}" "InstallDir"
StrCmp $INSTDIR "" unset done
unset:
!ifndef USE_PROGRAMFILES32
StrCpy $INSTDIR "$PROGRAMFILES64\OpenRA${SUFFIX}"
!else
StrCpy $INSTDIR "$PROGRAMFILES32\OpenRA${SUFFIX}"
!endif
done:
FunctionEnd
SetCompressor lzma
RequestExecutionLevel admin