Commit 99aa0dd9 authored by Rafaël Carré's avatar Rafaël Carré

win64 installer: install in \Programs Files

\Program Files (x86) is for 32bits programs
Fixes #4257

fix suggested by jb
parent 82f06bd0
...@@ -327,6 +327,20 @@ case "${host_os}" in ...@@ -327,6 +327,20 @@ case "${host_os}" in
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_win32" ac_default_prefix="`pwd`/_win32"
DESTDIR="`pwd`/_win32/" DESTDIR="`pwd`/_win32/"
dnl
dnl NSIS Installer prefix
dnl
case "${host}" in
amd64*|i686-w64*|x86_64*)
PROGRAMFILES="PROGRAMFILES64"
;;
*)
PROGRAMFILES="PROGRAMFILES"
;;
esac
AC_SUBST(PROGRAMFILES)
fi fi
if test "${SYS}" = "mingwce"; then if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv # add ws2 for closesocket, select, recv
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile ..\vlc-${VERSION}-win32.exe OutFile ..\vlc-${VERSION}-win32.exe
InstallDir "$PROGRAMFILES\VideoLAN\VLC" InstallDir "$@PROGRAMFILES@\VideoLAN\VLC"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
!ifdef NSIS_LZMA_COMPRESS_WHOLE !ifdef NSIS_LZMA_COMPRESS_WHOLE
SetCompressor lzma SetCompressor lzma
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment