Commit 14333978 authored by Vivien Kraus's avatar Vivien Kraus
Browse files

Conditionally select the NSIS default installdir based on sizeof (size_t)

If =sizeof (size_t)= is equal to 8, then we use =PROGRAMFILES64= as
the base install dir, otherwise we use =PROGRAMFILES=.  This is needed
to avoid installing 64-bit programs in Program Files (x86).
parent 406355cb
Pipeline #164551 passed with stages
in 83 minutes and 43 seconds
......@@ -76,6 +76,7 @@
/model/linear-*.h
/model/stacking.h
/model/tree-*.h
/nsi/setup.nsi
/nsi/tarot.ico
/po/*.gmo
/po/Makefile
......
......@@ -126,6 +126,10 @@ AC_CHECK_HEADER([readline/history.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
AC_C_INLINE
AC_CHECK_SIZEOF([size_t])
W64=""
AS_IF([test "x$ac_cv_sizeof_size_t" == "x8"], [W64="64"])
AC_SUBST([W64])
# Checks for library functions.
AC_SEARCH_LIBS([add_history], [history])
......@@ -141,6 +145,7 @@ AC_CONFIG_FILES([
eu.planete_kraus.Tarot.desktop
src/tarot-app/tarot-en
.dir-locals.el
nsi/setup.nsi
], [chmod +x pre-inst-env])
AC_OUTPUT
......@@ -2,7 +2,7 @@ name "Tarot"
!define MUI_ICON "tarot.ico"
OutFile "tarot-setup.exe"
InstallDir $PROGRAMFILES\Tarot
InstallDir $PROGRAMFILES@W64@\Tarot
RequestExecutionLevel admin
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
......
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